Skip to content

Commit

Permalink
Merge pull request #78839 from lewiji/normal_roughness_mobile_fix
Browse files Browse the repository at this point in the history
Fix invalid shader compilation when using `hint_normal_roughness_texture` in mobile backend
  • Loading branch information
akien-mga committed Jul 8, 2023
2 parents 6ab727e + 2a93681 commit 46cd84b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions servers/rendering/shader_language.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down

0 comments on commit 46cd84b

Please sign in to comment.