Mesa (gallium-0.1): mesa: do scope replacement for variable initializers too

[Brian Paul]

Module: Mesa
Branch: gallium-0.1
Commit: 40217db75ae08d04eee696d5092b34d2b2cfd8b0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=40217db75ae08d04eee696d5092b34d2b2cfd8b0

Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Oct 31 17:27:41 2008 -0600

mesa: do scope replacement for variable initializers too

---

 src/mesa/shader/slang/slang_compile_operation.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c
index c0d469c..1002be1 100644
--- a/src/mesa/shader/slang/slang_compile_operation.c
+++ b/src/mesa/shader/slang/slang_compile_operation.c
@@ -84,6 +84,17 @@ slang_replace_scope(slang_operation *oper,
        oper->locals->outer_scope == oldScope) {
       oper->locals->outer_scope = newScope;
    }
+
+   if (oper->type == SLANG_OPER_VARIABLE_DECL) {
+      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);
+      }
+   }
+
    for (i = 0; i < oper->num_children; i++) {
       slang_replace_scope(&oper->children[i], oldScope, newScope);
    }