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

Merge pull request #37313 from Chaosus/shader_fix_for

Browse source 
Prevent shader crash if multiple variables has been declared in 'for'
This commit is contained in:
Yuri Roubinsky 2020-03-28 23:33:17 +03:00 committed by GitHub
commit fafb0ba06d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servers/rendering/shader_language.cpp
View file

@ -5070,6 +5070,10 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
p_block->variables[name] = var; p_block->variables[name] = var;
if (tk.type == TK_COMMA) { 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(); tk = _get_token();
//another variable //another variable
} else if (tk.type == TK_SEMICOLON) { } else if (tk.type == TK_SEMICOLON) {
@ -5394,6 +5398,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
cf->flow_op = FLOW_OP_FOR; cf->flow_op = FLOW_OP_FOR;
BlockNode *init_block = alloc_node<BlockNode>(); BlockNode *init_block = alloc_node<BlockNode>();
init_block->block_type = BlockNode::BLOCK_TYPE_FOR;
init_block->parent_block = p_block; init_block->parent_block = p_block;
init_block->single_statement = true; init_block->single_statement = true;
cf->blocks.push_back(init_block); cf->blocks.push_back(init_block);

1
servers/rendering/shader_language.h
View file

@ -487,6 +487,7 @@ public:
enum BlockType { enum BlockType {
BLOCK_TYPE_STANDART, BLOCK_TYPE_STANDART,
BLOCK_TYPE_FOR,
BLOCK_TYPE_SWITCH, BLOCK_TYPE_SWITCH,
BLOCK_TYPE_CASE, BLOCK_TYPE_CASE,
BLOCK_TYPE_DEFAULT, BLOCK_TYPE_DEFAULT,