godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #107475 from beicause/fix-global-shader-texture-uniform

Browse Source 
Fix global shader texture uniform
This commit is contained in:
Rémi Verschelde
2025-06-13 15:54:09 +02:00
parent e15770e96a 7419e4429d
commit 3b2b0157ff
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -872,10 +872,14 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
E->value = global_textures_pass;
}
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);
RID override_rid = v->override;
if (override_rid.is_valid()) {
textures.push_back(override_rid);
} else {
RID value_rid = v->value;
if (value_rid.is_valid()) {
textures.push_back(value_rid);
}
}
}

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

@@ -906,10 +906,14 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
E->value = global_textures_pass;
}
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);
RID override_rid = v->override;
if (override_rid.is_valid()) {
textures.push_back(override_rid);
} else {
RID value_rid = v->value;
if (value_rid.is_valid()) {
textures.push_back(value_rid);
}
}
}