Merge pull request #89752 from ze2j/fix_false_positive_errors_in_gdsh…

…aderinc_files Fix false positive errors in gdshaderinc files
godotengine · Apr 10, 2024 · 50b89e6 · 50b89e6
2 parents c59f493 + 993cd25
commit 50b89e6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
@@ -8361,7 +8361,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
  }
  }
 #endif // DEBUG_ENABLED
- if (String(shader_type_identifier) != "spatial") {
+ if (shader_type_identifier != StringName() && String(shader_type_identifier) != "spatial") {
  _set_error(vformat(RTR("Uniform instances are not yet implemented for '%s' shaders."), shader_type_identifier));
  return ERR_PARSE_ERROR;
  }
@@ -8848,7 +8848,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
  _set_error(RTR("'hint_normal_roughness_texture' is only available when using the Forward+ backend."));
  return ERR_PARSE_ERROR;
  }
- if (String(shader_type_identifier) != "spatial") {
+ if (shader_type_identifier != StringName() && String(shader_type_identifier) != "spatial") {
  _set_error(vformat(RTR("'hint_normal_roughness_texture' is not supported in '%s' shaders."), shader_type_identifier));
  return ERR_PARSE_ERROR;
  }
@@ -8857,7 +8857,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
  new_hint = ShaderNode::Uniform::HINT_DEPTH_TEXTURE;
  --texture_uniforms;
  --texture_binding;
- if (String(shader_type_identifier) != "spatial") {
+ if (shader_type_identifier != StringName() && String(shader_type_identifier) != "spatial") {
  _set_error(vformat(RTR("'hint_depth_texture' is not supported in '%s' shaders."), shader_type_identifier));
  return ERR_PARSE_ERROR;
  }