mesa: do scope replacement for while/for loops too

This fixes a function inlining bug involving vars declared inside loop bodies.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c
index 1002be16c..53cf6faff 100644
--- a/src/mesa/shader/slang/slang_compile_operation.c
+++ b/src/mesa/shader/slang/slang_compile_operation.c
@@ -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);
    }