seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash on PowerVR GE8320 GPUs

Browse Source
This commit is contained in:
Miley Hollenberg
2024-07-30 08:43:04 +02:00
parent 0e9caa2d9c
commit 1c31e30359
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gles3/shader_gles3.cpp
View File

@ -698,7 +698,8 @@ void ShaderGLES3::_clear_version(Version *p_version) {
void ShaderGLES3::_initialize_version(Version *p_version) { void ShaderGLES3::_initialize_version(Version *p_version) {
ERR_FAIL_COND(p_version->variants.size() > 0); ERR_FAIL_COND(p_version->variants.size() > 0);
if (shader_cache_dir_valid && _load_from_cache(p_version)) { bool use_cache = shader_cache_dir_valid && !(feedback_count > 0 && GLES3::Config::get_singleton()->disable_transform_feedback_shader_cache);
if (use_cache && _load_from_cache(p_version)) {
return; return;
} }
p_version->variants.reserve(variant_count); p_version->variants.reserve(variant_count);
@ -709,7 +710,7 @@ void ShaderGLES3::_initialize_version(Version *p_version) {
_compile_specialization(spec, i, p_version, specialization_default_mask); _compile_specialization(spec, i, p_version, specialization_default_mask);
p_version->variants[i].insert(specialization_default_mask, spec); p_version->variants[i].insert(specialization_default_mask, spec);
} }
if (shader_cache_dir_valid) { if (use_cache) {
_save_to_cache(p_version); _save_to_cache(p_version);
} }
} }

2
drivers/gles3/storage/config.cpp
View File

@ -218,6 +218,8 @@ Config::Config() {
//https://github.com/godotengine/godot/issues/92662#issuecomment-2161199477 //https://github.com/godotengine/godot/issues/92662#issuecomment-2161199477
//disable_particles_workaround = false; //disable_particles_workaround = false;
} }
} else if (rendering_device_name == "PowerVR Rogue GE8320") {
disable_transform_feedback_shader_cache = true;
} }
} }

3
drivers/gles3/storage/config.h
View File

@ -96,6 +96,9 @@ public:
bool disable_particles_workaround = false; // set to 'true' to disable 'GPUParticles' bool disable_particles_workaround = false; // set to 'true' to disable 'GPUParticles'
bool flip_xy_workaround = false; bool flip_xy_workaround = false;
// PowerVR GE 8320 workaround
bool disable_transform_feedback_shader_cache = false;
#ifdef ANDROID_ENABLED #ifdef ANDROID_ENABLED
PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC eglFramebufferTextureMultiviewOVR = nullptr; PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC eglFramebufferTextureMultiviewOVR = nullptr;
PFNGLTEXSTORAGE3DMULTISAMPLEPROC eglTexStorage3DMultisample = nullptr; PFNGLTEXSTORAGE3DMULTISAMPLEPROC eglTexStorage3DMultisample = nullptr;