From: Brian Paul <brianp@vmware.com>
Date: Wed, 24 Jun 2009 22:25:00 +0000 (-0600)
Subject: glsl: fix up scoping for parent/children in slang_operation_copy()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=515513b40925ebd94502cf0511a414d8d4f52078;p=mesa.git

glsl: fix up scoping for parent/children in slang_operation_copy()

This will need more testing, but no regressions seen so far.
---

diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c
index 48586c2d96d..3e2bdbc91ff 100644
--- a/src/mesa/shader/slang/slang_compile_operation.c
+++ b/src/mesa/shader/slang/slang_compile_operation.c
@@ -154,6 +154,15 @@ slang_operation_copy(slang_operation * x, const slang_operation * y)
          return GL_FALSE;
       }
    }
+
+   /* update scoping for children */
+   for (i = 0; i < y->num_children; i++) {
+      if (y->children[i].locals &&
+          y->children[i].locals->outer_scope == y->locals) {
+         z.children[i].locals->outer_scope = z.locals;
+      }
+   }
+
 #if 0
    z.var = y->var;
    z.fun = y->fun;