asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #68808 from CherrySodaPop/global-instance-uniform

Browse source
This commit is contained in:
Yuri Rubinsky 2022-11-18 09:49:49 +03:00 committed by GitHub
commit e8f9cd8ac5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/rendering/shader_language.cpp
View file

@ -8190,6 +8190,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
}; };
[[fallthrough]]; [[fallthrough]];
case TK_INSTANCE: { case TK_INSTANCE: {
if (tk.type == TK_INSTANCE) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
keyword_completion_context = CF_UNIFORM_KEYWORD; keyword_completion_context = CF_UNIFORM_KEYWORD;
if (_lookup_next(next)) { if (_lookup_next(next)) {
@ -8210,6 +8211,7 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
} }
uniform_scope = ShaderNode::Uniform::SCOPE_INSTANCE; uniform_scope = ShaderNode::Uniform::SCOPE_INSTANCE;
} }
}
}; };
[[fallthrough]]; [[fallthrough]];
case TK_UNIFORM: case TK_UNIFORM: