diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-21 13:05:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 13:05:08 +0200 |
| commit | 71f82535791a6f70e41539486caab896ac3b433b (patch) | |
| tree | 4396a7e8a2dac41b75e66d721164d6032ec84e9e /servers/rendering | |
| parent | 88bf6e1c6d3e711976304bb16ac51719e8e82f72 (diff) | |
| parent | 14d5b47a27645cc1c3df7a908516b9510686ea3b (diff) | |
Merge pull request #50489 from Chaosus/shader_varying
Prevent error if varying assigned but not used (push warning instead)
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/shader_language.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index f771d6d0ef..01765c48b6 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -946,7 +946,9 @@ void ShaderLanguage::_parse_used_identifier(const StringName &p_identifier, Iden break; case IdentifierType::IDENTIFIER_VARYING: if (HAS_WARNING(ShaderWarning::UNUSED_VARYING_FLAG) && used_varyings.has(p_identifier)) { - used_varyings[p_identifier].used = true; + if (shader->varyings[p_identifier].stage != ShaderNode::Varying::STAGE_VERTEX && shader->varyings[p_identifier].stage != ShaderNode::Varying::STAGE_FRAGMENT) { + used_varyings[p_identifier].used = true; + } } break; case IdentifierType::IDENTIFIER_UNIFORM: @@ -7862,15 +7864,6 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct tk = _get_token(); } - - for (Map<StringName, ShaderNode::Varying>::Element *E = shader->varyings.front(); E; E = E->next()) { - if (E->get().stage == ShaderNode::Varying::STAGE_VERTEX || E->get().stage == ShaderNode::Varying::STAGE_FRAGMENT) { - _set_tkpos(E->get().tkpos); - _set_error(RTR("Varying must only be used in two different stages, which can be 'vertex' 'fragment' and 'light'")); - return ERR_PARSE_ERROR; - } - } - return OK; } |