gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-14 15:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79287 from bitsawer/fix_shader_type_detection

Browse source 
Fix shader type detection
This commit is contained in:
Yuri Sizov 2023-07-14 18:49:44 +02:00
parent de14f09c1d 905c10bc54
commit ead69eba96
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
scene/resources/shader.cpp
View file

@ -66,20 +66,6 @@ void Shader::set_code(const String &p_code) {
E->disconnect(SNAME("changed"), callable_mp(this, &Shader::_dependency_changed));
}
String type = ShaderLanguage::get_shader_type(p_code);
if (type == "canvas_item") {
mode = MODE_CANVAS_ITEM;
} else if (type == "particles") {
mode = MODE_PARTICLES;
} else if (type == "sky") {
mode = MODE_SKY;
} else if (type == "fog") {
mode = MODE_FOG;
} else {
mode = MODE_SPATIAL;
}
code = p_code;
String pp_code = p_code;
@ -100,6 +86,21 @@ void Shader::set_code(const String &p_code) {
}
}
// Try to get the shader type from the final, fully preprocessed shader code.
String type = ShaderLanguage::get_shader_type(pp_code);
if (type == "canvas_item") {
mode = MODE_CANVAS_ITEM;
} else if (type == "particles") {
mode = MODE_PARTICLES;
} else if (type == "sky") {
mode = MODE_SKY;
} else if (type == "fog") {
mode = MODE_FOG;
} else {
mode = MODE_SPATIAL;
}
for (const Ref<ShaderInclude> &E : include_dependencies) {
E->connect(SNAME("changed"), callable_mp(this, &Shader::_dependency_changed));
}