summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-07-08 18:19:49 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-07-08 18:19:49 +0200
commit46cd84b36212d5932c6cddfc6ed5f50ff60030bc (patch)
tree924a8ec124c921544f6043fccb4966ecd904d57f
parent6ab727edc2b0bf51ca3458237505ff8763f20cf9 (diff)
parent2a93681334d3388eebbe1ba34e633a40ed9f1333 (diff)
downloadredot-engine-46cd84b36212d5932c6cddfc6ed5f50ff60030bc.tar.gz
Merge pull request #78839 from lewiji/normal_roughness_mobile_fix
Fix invalid shader compilation when using `hint_normal_roughness_texture` in mobile backend
-rw-r--r--servers/rendering/shader_language.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
index cb05063e06..22e6f7d67d 100644
--- a/servers/rendering/shader_language.cpp
+++ b/servers/rendering/shader_language.cpp
@@ -8807,8 +8807,8 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
new_hint = ShaderNode::Uniform::HINT_NORMAL_ROUGHNESS_TEXTURE;
--texture_uniforms;
--texture_binding;
- if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
- _set_error(RTR("'hint_normal_roughness_texture' is not supported in gl_compatibility shaders."));
+ if (OS::get_singleton()->get_current_rendering_method() != "forward_plus") {
+ _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") {