1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103177 from Murrent/shader_default_at_top

Browse Source 
Allow `default` case at the top of a switch scope in shaders
This commit is contained in:
Thaddeus Crews 2025-03-07 15:12:55 -06:00
commit 7459a0361d
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
servers/rendering/shader_language.cpp
View File

@ -8460,9 +8460,11 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
pos = _get_tkpos(); pos = _get_tkpos();
tk = _get_token(); tk = _get_token();
TokenType prev_type; bool has_default = false;
if (tk.type == TK_CF_CASE || tk.type == TK_CF_DEFAULT) { if (tk.type == TK_CF_CASE || tk.type == TK_CF_DEFAULT) {
prev_type = tk.type; if (tk.type == TK_CF_DEFAULT) {
has_default = true;
}
_set_tkpos(pos); _set_tkpos(pos);
} else { } else {
_set_expected_error("case", "default"); _set_expected_error("case", "default");
@ -8476,17 +8478,15 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
} }
pos = _get_tkpos(); pos = _get_tkpos();
tk = _get_token(); tk = _get_token();
if (tk.type == TK_CF_CASE || tk.type == TK_CF_DEFAULT) { if (tk.type == TK_CF_CASE) {
if (prev_type == TK_CF_DEFAULT) { _set_tkpos(pos);
if (tk.type == TK_CF_CASE) { continue;
_set_error(RTR("Cases must be defined before default case.")); } else if (tk.type == TK_CF_DEFAULT) {
return ERR_PARSE_ERROR; if (has_default) {
} else if (prev_type == TK_CF_DEFAULT) { _set_error(RTR("Default case must be defined only once."));
_set_error(RTR("Default case must be defined only once.")); return ERR_PARSE_ERROR;
return ERR_PARSE_ERROR;
}
} }
prev_type = tk.type; has_default = true;
_set_tkpos(pos); _set_tkpos(pos);
continue; continue;
} else { } else {