From eefddb07bc23f454a38a3b61524cf73ea2cc02e7 Mon Sep 17 00:00:00 2001 From: clayjohn Date: Thu, 26 Jan 2023 12:14:45 -0800 Subject: Properly append global uniform buffer name in gl_compatibility shaders Also error when using instance uniforms --- servers/rendering/shader_language.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'servers/rendering') 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 &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) { -- cgit v1.2.3