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

Fix global shader uniform texture loading

Browse Source
This commit is contained in:
bitsawer 2023-08-15 14:03:37 +03:00
parent c495eb5102
commit 41def3740a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gles3/storage/material_storage.cpp
View File

@ -1957,14 +1957,16 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) { if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
//textire //textire
if (!p_load_textures) { if (!p_load_textures) {
value = RID();
continue; continue;
} }
String path = value; String path = value;
Ref<Resource> resource = ResourceLoader::load(path); if (path.is_empty()) {
ERR_CONTINUE(resource.is_null()); value = RID();
value = resource; } else {
Ref<Resource> resource = ResourceLoader::load(path);
value = resource;
}
} }
if (global_shader_uniforms.variables.has(name)) { if (global_shader_uniforms.variables.has(name)) {

10
servers/rendering/renderer_rd/storage_rd/material_storage.cpp
View File

@ -1821,14 +1821,16 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) { if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
//textire //textire
if (!p_load_textures) { if (!p_load_textures) {
value = RID();
continue; continue;
} }
String path = value; String path = value;
Ref<Resource> resource = ResourceLoader::load(path); if (path.is_empty()) {
ERR_CONTINUE(resource.is_null()); value = RID();
value = resource; } else {
Ref<Resource> resource = ResourceLoader::load(path);
value = resource;
}
} }
if (global_shader_uniforms.variables.has(name)) { if (global_shader_uniforms.variables.has(name)) {