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

Ensure global shader sampler parameters are initialized when loading the editor

This commit is contained in:
Chris Clyne 2024-05-01 15:13:14 +01:00
parent d4f726f3ef
commit 44364faee5
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1966,13 +1966,9 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
Variant value = d["value"];
if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
//textire
if (!p_load_textures) {
continue;
}
String path = value;
if (path.is_empty()) {
// Don't load the textures, but still add the parameter so shaders compile correctly while loading.
if (!p_load_textures || path.is_empty()) {
value = RID();
} else {
Ref<Resource> resource = ResourceLoader::load(path);

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

@ -1656,13 +1656,9 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
Variant value = d["value"];
if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
//textire
if (!p_load_textures) {
continue;
}
String path = value;
if (path.is_empty()) {
// Don't load the textures, but still add the parameter so shaders compile correctly while loading.
if (!p_load_textures || path.is_empty()) {
value = RID();
} else {
Ref<Resource> resource = ResourceLoader::load(path);