Merge pull request #72138 from clayjohn/GL-globals

Properly append global uniform buffer name in gl_compatibility shaders
This commit is contained in:
Rémi Verschelde
2023-01-26 22:52:42 +01:00
2 changed files with 11 additions and 0 deletions

View File

@@ -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) {