Skip to content

Commit

Permalink
Merge pull request #55957 from Chaosus/shader_fix_arrays
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chaosus
Chaosus authored Dec 15, 2021
2 parents 9b932aa + 25a2241 commit 1cbf394
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 56 deletions.
120 changes: 65 additions & 55 deletions servers/rendering/shader_language.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4399,27 +4399,28 @@ Error ShaderLanguage::_parse_global_array_size(int &r_array_size, const Function
return OK;
}

Error ShaderLanguage::_parse_local_array_size(BlockNode *p_block, const FunctionInfo &p_function_info, ArrayDeclarationNode *p_node, ArrayDeclarationNode::Declaration *p_decl, int &r_array_size, bool &r_is_unknown_size) {
Error ShaderLanguage::_parse_local_array_size(BlockNode *p_block, const FunctionInfo &p_function_info, Node *&r_size_expression, int &r_array_size, bool &r_is_unknown_size) {
TkPos pos = _get_tkpos();
Token tk = _get_token();

if (tk.type == TK_BRACKET_CLOSE) {
r_is_unknown_size = true;
} else {
int size = 0;
if (!tk.is_integer_constant() || ((int)tk.constant) <= 0) {
_set_tkpos(pos);
int array_size = 0;
Node *n = _parse_array_size(p_block, p_function_info, array_size);
if (!n) {
return ERR_PARSE_ERROR;
}
p_decl->size = array_size;
p_node->size_expression = n;
size = array_size;
r_size_expression = n;
} else if (((int)tk.constant) > 0) {
p_decl->size = (uint32_t)tk.constant;
size = (uint32_t)tk.constant;
}

if (p_decl->size <= 0) {
if (size <= 0) {
_set_error("Expected single integer constant > 0");
return ERR_PARSE_ERROR;
}
Expand All @@ -4430,7 +4431,7 @@ Error ShaderLanguage::_parse_local_array_size(BlockNode *p_block, const Function
return ERR_PARSE_ERROR;
}

r_array_size = p_decl->size;
r_array_size = size;
}

return OK;
Expand Down Expand Up @@ -6464,49 +6465,44 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
return ERR_PARSE_ERROR;
}

tk = _get_token();

Node *vardecl = nullptr;
int array_size = 0;
bool fixed_array_size = false;
bool first = true;

while (true) {
do {
bool unknown_size = false;
int array_size = 0;
Node *size_expr = nullptr;

ArrayDeclarationNode *anode = nullptr;
ArrayDeclarationNode::Declaration adecl;

if (tk.type != TK_IDENTIFIER && tk.type != TK_BRACKET_OPEN) {
_set_error("Expected identifier or '[' after datatype.");
return ERR_PARSE_ERROR;
}
tk = _get_token();

if (tk.type == TK_BRACKET_OPEN) {
anode = alloc_node<ArrayDeclarationNode>();
if (first) {
first = false;

if (is_struct) {
anode->struct_name = struct_name;
anode->datatype = TYPE_STRUCT;
} else {
anode->datatype = type;
if (tk.type != TK_IDENTIFIER && tk.type != TK_BRACKET_OPEN) {
_set_error("Expected identifier or '[' after datatype.");
return ERR_PARSE_ERROR;
}

anode->precision = precision;
anode->is_const = is_const;
vardecl = (Node *)anode;

adecl.size = 0U;
adecl.single_expression = false;
if (tk.type == TK_BRACKET_OPEN) {
Error error = _parse_local_array_size(p_block, p_function_info, size_expr, array_size, unknown_size);
if (error != OK) {
return error;
}
adecl.single_expression = false;
adecl.size = array_size;

Error error = _parse_local_array_size(p_block, p_function_info, anode, &adecl, array_size, unknown_size);
if (error != OK) {
return error;
fixed_array_size = true;
tk = _get_token();
}
tk = _get_token();
}

if (tk.type != TK_IDENTIFIER) {
_set_error("Expected identifier!");
return ERR_PARSE_ERROR;
}
if (tk.type != TK_IDENTIFIER) {
_set_error("Expected identifier!");
return ERR_PARSE_ERROR;
}

StringName name = tk.text;
Expand Down Expand Up @@ -6544,8 +6540,10 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun

tk = _get_token();

bool is_array_decl = var.array_size > 0 || unknown_size;

if (tk.type == TK_BRACKET_OPEN) {
if (var.array_size > 0 || unknown_size) {
if (is_array_decl) {
_set_error("Array size is already defined!");
return ERR_PARSE_ERROR;
}
Expand All @@ -6555,28 +6553,37 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
return ERR_PARSE_ERROR;
}

anode = alloc_node<ArrayDeclarationNode>();
if (is_struct) {
anode->struct_name = struct_name;
anode->datatype = TYPE_STRUCT;
} else {
anode->datatype = type;
Error error = _parse_local_array_size(p_block, p_function_info, size_expr, var.array_size, unknown_size);
if (error != OK) {
return error;
}
anode->precision = precision;
anode->is_const = is_const;
vardecl = (Node *)anode;

adecl.size = 0U;
adecl.single_expression = false;
adecl.size = var.array_size;
array_size = var.array_size;

Error error = _parse_local_array_size(p_block, p_function_info, anode, &adecl, var.array_size, unknown_size);
if (error != OK) {
return error;
}
is_array_decl = true;
tk = _get_token();
}

if (var.array_size > 0 || unknown_size) {
if (is_array_decl) {
{
anode = alloc_node<ArrayDeclarationNode>();

if (is_struct) {
anode->struct_name = struct_name;
anode->datatype = TYPE_STRUCT;
} else {
anode->datatype = type;
}

anode->precision = precision;
anode->is_const = is_const;
anode->size_expression = size_expr;

vardecl = (Node *)anode;
}

bool full_def = false;

if (tk.type == TK_OP_ASSIGN) {
Expand Down Expand Up @@ -6794,6 +6801,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
}
}

array_size = var.array_size;
anode->declarations.push_back(adecl);
} else if (tk.type == TK_OP_ASSIGN) {
VariableDeclarationNode *node = alloc_node<VariableDeclarationNode>();
Expand Down Expand Up @@ -6862,22 +6870,24 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
}

p_block->statements.push_back(vardecl);

p_block->variables[name] = var;

if (!fixed_array_size) {
array_size = 0;
}

if (tk.type == TK_COMMA) {
if (p_block->block_type == BlockNode::BLOCK_TYPE_FOR) {
_set_error("Multiple declarations in 'for' loop are not implemented yet.");
return ERR_PARSE_ERROR;
}
tk = _get_token();
//another variable
} else if (tk.type == TK_SEMICOLON) {
break;
} else {
_set_error("Expected ',' or ';' after variable");
return ERR_PARSE_ERROR;
}
}
} while (tk.type == TK_COMMA); //another variable
} else if (tk.type == TK_CURLY_BRACKET_OPEN) {
//a sub block, just because..
BlockNode *block = alloc_node<BlockNode>();
Expand Down
2 changes: 1 addition & 1 deletion servers/rendering/shader_language.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ class ShaderLanguage {

Node *_parse_array_size(BlockNode *p_block, const FunctionInfo &p_function_info, int &r_array_size);
Error _parse_global_array_size(int &r_array_size, const FunctionInfo &p_function_info);
Error _parse_local_array_size(BlockNode *p_block, const FunctionInfo &p_function_info, ArrayDeclarationNode *p_node, ArrayDeclarationNode::Declaration *p_decl, int &r_array_size, bool &r_is_unknown_size);
Error _parse_local_array_size(BlockNode *p_block, const FunctionInfo &p_function_info, Node *&r_size_expression, int &r_array_size, bool &r_is_unknown_size);

Node *_parse_expression(BlockNode *p_block, const FunctionInfo &p_function_info);
Node *_parse_array_constructor(BlockNode *p_block, const FunctionInfo &p_function_info);
Expand Down

0 comments on commit 1cbf394

Please sign in to comment.