KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: better fix for for-loop scope issue (commit 6333005f7a)

This commit is contained in:
Brian Paul 2009-01-12 08:52:54 -07:00
parent 88fdddcbbe
commit 06fdb6a74c
3 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/shader/slang/library/slang_shader.syn
View File

@ -1161,13 +1161,6 @@ compound_statement_2
compound_statement_3 compound_statement_3
lbrace .and statement_list .and rbrace; lbrace .and statement_list .and rbrace;
/*
* <statement_no_new_scope> ::= <compound_statement_no_new_scope>
* | <simple_statement>
*/
statement_no_new_scope
compound_statement_no_new_scope .or simple_statement;
/* /*
* <compound_statement_no_new_scope> ::= "{" "}" * <compound_statement_no_new_scope> ::= "{" "}"
* | "{" <statement_list> "}" * | "{" <statement_list> "}"
@ -1181,6 +1174,7 @@ compound_statement_no_new_scope_2
compound_statement_no_new_scope_3 compound_statement_no_new_scope_3
lbrace .and statement_list .and rbrace; lbrace .and statement_list .and rbrace;
/* /*
* <statement_list> ::= <statement> * <statement_list> ::= <statement>
* | <statement_list> <statement> * | <statement_list> <statement>
@ -1242,8 +1236,7 @@ condition_3
/* /*
* <iteration_statement> ::= "while" "(" <condition> ")" <statement> * <iteration_statement> ::= "while" "(" <condition> ")" <statement>
* | "do" <statement> "while" "(" <expression> ")" ";" * | "do" <statement> "while" "(" <expression> ")" ";"
* | "for" "(" <for_init_statement> <for_rest_statement> ")" * | "for" "(" <for_init_statement> <for_rest_statement> ")" <statement>
* <statement_no_new_scope>
*/ */
iteration_statement iteration_statement
iteration_statement_1 .or iteration_statement_2 .or iteration_statement_3; iteration_statement_1 .or iteration_statement_2 .or iteration_statement_3;
@ -1255,7 +1248,7 @@ iteration_statement_2
expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon; expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon;
iteration_statement_3 iteration_statement_3
"for" .emit OP_FOR .and lparen .error LPAREN_EXPECTED .and for_init_statement .and "for" .emit OP_FOR .and lparen .error LPAREN_EXPECTED .and for_init_statement .and
for_rest_statement .and rparen .error RPAREN_EXPECTED .and statement_no_new_scope; for_rest_statement .and rparen .error RPAREN_EXPECTED .and statement;
/* /*
* <for_init_statement> ::= <expression_statement> * <for_init_statement> ::= <expression_statement>

4
src/mesa/shader/slang/library/slang_shader_syn.h
View File

@ -566,8 +566,6 @@
" lbrace .and rbrace;\n" " lbrace .and rbrace;\n"
"compound_statement_3\n" "compound_statement_3\n"
" lbrace .and statement_list .and rbrace;\n" " lbrace .and statement_list .and rbrace;\n"
"statement_no_new_scope\n"
" compound_statement_no_new_scope .or simple_statement;\n"
"compound_statement_no_new_scope\n" "compound_statement_no_new_scope\n"
" compound_statement_no_new_scope_1 .emit OP_BLOCK_BEGIN_NO_NEW_SCOPE .and .true .emit OP_END;\n" " compound_statement_no_new_scope_1 .emit OP_BLOCK_BEGIN_NO_NEW_SCOPE .and .true .emit OP_END;\n"
"compound_statement_no_new_scope_1\n" "compound_statement_no_new_scope_1\n"
@ -617,7 +615,7 @@
" expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon;\n" " expression .and rparen .error RPAREN_EXPECTED .emit OP_END .and semicolon;\n"
"iteration_statement_3\n" "iteration_statement_3\n"
" \"for\" .emit OP_FOR .and lparen .error LPAREN_EXPECTED .and for_init_statement .and\n" " \"for\" .emit OP_FOR .and lparen .error LPAREN_EXPECTED .and for_init_statement .and\n"
" for_rest_statement .and rparen .error RPAREN_EXPECTED .and statement_no_new_scope;\n" " for_rest_statement .and rparen .error RPAREN_EXPECTED .and statement;\n"
"for_init_statement\n" "for_init_statement\n"
" expression_statement .emit OP_EXPRESSION .or declaration_statement .emit OP_DECLARE;\n" " expression_statement .emit OP_EXPRESSION .or declaration_statement .emit OP_DECLARE;\n"
"conditionopt\n" "conditionopt\n"

18
src/mesa/shader/slang/slang_compile.c
View File

@ -1138,26 +1138,8 @@ parse_statement(slang_parse_ctx * C, slang_output_ctx * O,
RETURN0; RETURN0;
if (!parse_child_operation(C, &o, oper, GL_FALSE)) if (!parse_child_operation(C, &o, oper, GL_FALSE))
RETURN0; RETURN0;
#if 0
if (!parse_child_operation(C, &o, oper, GL_TRUE)) if (!parse_child_operation(C, &o, oper, GL_TRUE))
RETURN0; RETURN0;
#else
/* force creation of new scope for loop body */
{
slang_operation *ch;
slang_output_ctx oo = o;
/* grow child array */
ch = slang_operation_grow(&oper->num_children, &oper->children);
ch->type = SLANG_OPER_BLOCK_NEW_SCOPE;
ch->locals->outer_scope = o.vars;
oo.vars = ch->locals;
if (!parse_child_operation(C, &oo, ch, GL_TRUE))
RETURN0;
}
#endif
} }
break; break;
case OP_PRECISION: case OP_PRECISION: