godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shader crash when using varying array in fragment->light context

Browse Source 
(cherry picked from commit fead1595f9)
This commit is contained in:
Yuri Roubinsky 2021-08-11 09:38:38 +03:00 committed by Rémi Verschelde
parent 9c9559654b
commit 144e0856a4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
servers/visual/shader_language.cpp
View File

@ -3520,9 +3520,16 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (ident_type == IDENTIFIER_VARYING) { if (ident_type == IDENTIFIER_VARYING) {
TkPos prev_pos = _get_tkpos(); TkPos prev_pos = _get_tkpos();
Token next_token = _get_token(); Token next_token = _get_token();
_set_tkpos(prev_pos);
String error;
// An array of varyings.
if (next_token.type == TK_BRACKET_OPEN) {
_get_token(); // Pass constant.
_get_token(); // Pass TK_BRACKET_CLOSE.
next_token = _get_token();
}
_set_tkpos(prev_pos);
String error;
if (is_token_operator_assign(next_token.type)) { if (is_token_operator_assign(next_token.type)) {
if (!_validate_varying_assign(shader->varyings[identifier], &error)) { if (!_validate_varying_assign(shader->varyings[identifier], &error)) {
_set_error(error); _set_error(error);
@ -5788,6 +5795,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
DataInterpolation interpolation = INTERPOLATION_SMOOTH; DataInterpolation interpolation = INTERPOLATION_SMOOTH;
DataType type; DataType type;
StringName name; StringName name;
int array_size = 0;
tk = _get_token(); tk = _get_token();
if (is_token_interpolation(tk.type)) { if (is_token_interpolation(tk.type)) {
@ -5818,6 +5826,30 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
} }
tk = _get_token(); tk = _get_token();
if (tk.type == TK_BRACKET_OPEN) {
if (uniform) {
_set_error(vformat("Uniform arrays are not yet implemented!"));
return ERR_PARSE_ERROR;
}
tk = _get_token();
if (tk.type == TK_INT_CONSTANT && tk.constant > 0) {
array_size = (int)tk.constant;
tk = _get_token();
if (tk.type == TK_BRACKET_CLOSE) {
tk = _get_token();
} else {
_set_error("Expected ']'");
return ERR_PARSE_ERROR;
}
} else {
_set_error("Expected integer constant > 0");
return ERR_PARSE_ERROR;
}
}
if (tk.type != TK_IDENTIFIER) { if (tk.type != TK_IDENTIFIER) {
_set_error("Expected identifier!"); _set_error("Expected identifier!");
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
@ -6002,6 +6034,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
varying.precision = precision; varying.precision = precision;
varying.interpolation = interpolation; varying.interpolation = interpolation;
varying.tkpos = name_pos; varying.tkpos = name_pos;
varying.array_size = array_size;
tk = _get_token(); tk = _get_token();
if (tk.type != TK_SEMICOLON && tk.type != TK_BRACKET_OPEN) { if (tk.type != TK_SEMICOLON && tk.type != TK_BRACKET_OPEN) {
@ -6010,6 +6043,10 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
} }
if (tk.type == TK_BRACKET_OPEN) { if (tk.type == TK_BRACKET_OPEN) {
if (array_size > 0) {
_set_error("Array size is already defined!");
return ERR_PARSE_ERROR;
}
tk = _get_token(); tk = _get_token();
if (tk.type == TK_INT_CONSTANT && tk.constant > 0) { if (tk.type == TK_INT_CONSTANT && tk.constant > 0) {
varying.array_size = (int)tk.constant; varying.array_size = (int)tk.constant;