diff options
| author | clayjohn <claynjohn@gmail.com> | 2023-01-26 12:14:45 -0800 |
|---|---|---|
| committer | clayjohn <claynjohn@gmail.com> | 2023-01-26 12:14:45 -0800 |
| commit | eefddb07bc23f454a38a3b61524cf73ea2cc02e7 (patch) | |
| tree | 628afbcb4850dd0248b423fc9db81be68a715c11 /servers/rendering | |
| parent | 44c0bfc94d81e758b39a8ee43df5915d64200ed6 (diff) | |
Properly append global uniform buffer name in gl_compatibility shaders
Also error when using instance uniforms
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/shader_language.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index 91e9879bae..a8a7075047 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -8243,6 +8243,10 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f _set_error(vformat(RTR("Uniform instances are not yet implemented for '%s' shaders."), shader_type_identifier)); return ERR_PARSE_ERROR; } + if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { + _set_error(RTR("Uniform instances are not supported in gl_compatibility shaders.")); + return ERR_PARSE_ERROR; + } if (uniform_scope == ShaderNode::Uniform::SCOPE_LOCAL) { tk = _get_token(); if (tk.type != TK_UNIFORM) { |