fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 06:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: do scope replacement for while/for loops too

Browse source 
This fixes a function inlining bug involving vars declared inside loop bodies.
This commit is contained in:
Brian Paul 2008-11-01 15:55:39 -06:00
parent 58936b51af
commit e9bc632d82
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/shader/slang/slang_compile_operation.c
View file

@ -80,21 +80,23 @@ slang_replace_scope(slang_operation *oper,
slang_variable_scope *newScope)
{
GLuint i;
if (oper->locals != newScope &&
oper->locals->outer_scope == oldScope) {
/* found. replace old w/ new */
oper->locals->outer_scope = newScope;
}
if (oper->type == SLANG_OPER_VARIABLE_DECL) {
/* search/replace in the initializer */
slang_variable *var;
var = _slang_locate_variable(oper->locals, oper->a_id, GL_TRUE);
if (var && var->initializer) {
printf("replace scope for %s initializer\n",
(char *) var->a_name);
slang_replace_scope(var->initializer, oldScope, newScope);
}
}
/* search/replace in children */
for (i = 0; i < oper->num_children; i++) {
slang_replace_scope(&oper->children[i], oldScope, newScope);
}
@ -159,7 +161,9 @@ slang_operation_copy(slang_operation * x, const slang_operation * y)
/* If this operation declares a new scope, we need to make sure
* all children point to it, not the original operation's scope!
*/
if (x->type == SLANG_OPER_BLOCK_NEW_SCOPE) {
if (x->type == SLANG_OPER_BLOCK_NEW_SCOPE ||
x->type == SLANG_OPER_WHILE ||
x->type == SLANG_OPER_FOR) {
slang_replace_scope(x, y->locals, x->locals);
}