summaryrefslogtreecommitdiff
path: root/servers/rendering
diff options
context:
space:
mode:
authorYuri Rubinsky <chaosus89@gmail.com>2022-11-09 22:55:41 +0300
committerGitHub <noreply@github.com>2022-11-09 22:55:41 +0300
commitdca5cb8e40fd2a348a59ea73c597eb742c14c980 (patch)
tree47770a0d9714cb507114fd8a35b5294f081ffe0c /servers/rendering
parente25d9281d4f6f0b5b4d972b25cddaa1009ad1d26 (diff)
parentc07d13182c7247d3de529e700e6526949b294764 (diff)
Merge pull request #68413 from Chaosus/fix_instance_uniforms
Diffstat (limited to 'servers/rendering')
-rw-r--r--servers/rendering/shader_language.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
index 2f5846f520..14c09c1512 100644
--- a/servers/rendering/shader_language.cpp
+++ b/servers/rendering/shader_language.cpp
@@ -8178,6 +8178,10 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
}
}
#endif // DEBUG_ENABLED
+ if (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;
+ }
if (uniform_scope == ShaderNode::Uniform::SCOPE_LOCAL) {
tk = _get_token();
if (tk.type != TK_UNIFORM) {