godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Fix handling of async hidden render mode

Browse Source 
- Mute errors when conditioned shader is not ready yet
- Avoid depth pre-pass on meshes that would end up black
This commit is contained in:
Pedro J. Estébanez
2022-04-12 20:08:09 +02:00
parent 33500a1529
commit 41fc0abf77
3 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gles3/shader_gles3.cpp
View File

@@ -148,6 +148,34 @@ bool ShaderGLES3::_bind(bool p_binding_fallback) {
}
}
bool ShaderGLES3::is_custom_code_ready_for_render(uint32_t p_code_id) {
if (p_code_id == 0) {
return true;
}
if (!is_async_compilation_supported() || get_ubershader_flags_uniform() == -1) {
return true;
}
CustomCode *cc = custom_code_map.getptr(p_code_id);
ERR_FAIL_COND_V(!cc, false);
if (cc->async_mode == ASYNC_MODE_HIDDEN) {
#ifdef DEBUG_ENABLED
if (VS::get_singleton()->is_force_shader_fallbacks_enabled()) {
return false;
}
#endif
VersionKey effective_version;
effective_version.version = new_conditional_version.version;
effective_version.code_version = p_code_id;
Version *v = version_map.getptr(effective_version);
if (!v || cc->version != v->code_version || v->compile_status != Version::COMPILE_STATUS_OK) {
return false;
}
}
return true;
}
bool ShaderGLES3::_bind_ubershader() {
#ifdef DEBUG_ENABLED
ERR_FAIL_COND_V(!is_async_compilation_supported(), false);