asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #80654 from bitsawer/fix_global_uniform_texture_set

Browse source 
Fix global shader uniform texture loading
This commit is contained in:
Rémi Verschelde 2023-08-16 09:17:25 +02:00
commit 9d9043a9c8
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gles3/storage/material_storage.cpp
View file

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

6
servers/rendering/renderer_rd/storage_rd/material_storage.cpp
View file

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