diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-26 22:52:42 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-26 22:52:42 +0100 |
| commit | 3cacc835266af9446e3a51020c4ce1d36e4ad327 (patch) | |
| tree | ed741b8b50d4d4a0b52d80649538614b30b0f6e8 /servers/rendering | |
| parent | 7cf21f296bfe931fb4243f1c16f9f6b5963a9ef4 (diff) | |
| parent | eefddb07bc23f454a38a3b61524cf73ea2cc02e7 (diff) | |
Merge pull request #72138 from clayjohn/GL-globals
Properly append global uniform buffer name in gl_compatibility shaders
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 d1d31d0f8e..7a4ac709f4 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -8285,6 +8285,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) { |