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

Add shader_cache_dir_valid check to _save_to_cache

This commit is contained in:
jsjtxietian 2024-01-12 11:17:57 +08:00
parent 3524346689
commit a365c070b3
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gles3/shader_gles3.cpp
View File

@ -611,6 +611,7 @@ void ShaderGLES3::_save_to_cache(Version *p_version) {
#ifdef WEB_ENABLED // not supported in webgl #ifdef WEB_ENABLED // not supported in webgl
return; return;
#else #else
ERR_FAIL_COND(!shader_cache_dir_valid);
#if !defined(ANDROID_ENABLED) && !defined(IOS_ENABLED) #if !defined(ANDROID_ENABLED) && !defined(IOS_ENABLED)
if (RasterizerGLES3::is_gles_over_gl() && (glGetProgramBinary == NULL)) { // ARB_get_program_binary extension not available. if (RasterizerGLES3::is_gles_over_gl() && (glGetProgramBinary == NULL)) { // ARB_get_program_binary extension not available.
return; return;

4
drivers/gles3/shader_gles3.h
View File

@ -209,7 +209,9 @@ protected:
_compile_specialization(s, p_variant, version, p_specialization); _compile_specialization(s, p_variant, version, p_specialization);
version->variants[p_variant].insert(p_specialization, s); version->variants[p_variant].insert(p_specialization, s);
spec = version->variants[p_variant].lookup_ptr(p_specialization); spec = version->variants[p_variant].lookup_ptr(p_specialization);
_save_to_cache(version); if (shader_cache_dir_valid) {
_save_to_cache(version);
}
} }
} else if (spec->build_queued) { } else if (spec->build_queued) {
// Still queued, wait // Still queued, wait

1
servers/rendering/renderer_rd/shader_rd.cpp
View File

@ -463,6 +463,7 @@ bool ShaderRD::_load_from_cache(Version *p_version, int p_group) {
} }
void ShaderRD::_save_to_cache(Version *p_version, int p_group) { void ShaderRD::_save_to_cache(Version *p_version, int p_group) {
ERR_FAIL_COND(!shader_cache_dir_valid);
String sha1 = _version_get_sha1(p_version); String sha1 = _version_get_sha1(p_version);
String path = shader_cache_dir.path_join(name).path_join(group_sha256[p_group]).path_join(sha1) + ".cache"; String path = shader_cache_dir.path_join(name).path_join(group_sha256[p_group]).path_join(sha1) + ".cache";