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

Merge pull request #101941 from dsnopek/opengl-global-uniform-sampler2darray

Browse Source 
Fix wrong default texture for global uniforms of type `sampler2DArray`
This commit is contained in:
Thaddeus Crews
2025-06-09 17:08:47 -05:00
parent 0717eda470 fa30719814
commit 7584546399
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,7 +872,11 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
E->value = global_textures_pass;
}
textures.push_back(v->override.get_type() != Variant::NIL ? v->override : v->value);
if (v->override.get_type() == Variant::RID && ((RID)v->override).is_valid()) {
textures.push_back(v->override);
} else if (v->value.get_type() == Variant::RID && ((RID)v->value).is_valid()) {
textures.push_back(v->value);
}
}
} else {

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

@ -906,7 +906,11 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
E->value = global_textures_pass;
}
textures.push_back(v->override.get_type() != Variant::NIL ? v->override : v->value);
if (v->override.get_type() == Variant::RID && ((RID)v->override).is_valid()) {
textures.push_back(v->override);
} else if (v->value.get_type() == Variant::RID && ((RID)v->value).is_valid()) {
textures.push_back(v->value);
}
}
} else {