From 40217db75ae08d04eee696d5092b34d2b2cfd8b0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 31 Oct 2008 17:27:41 -0600 Subject: [PATCH] mesa: do scope replacement for variable initializers too --- src/mesa/shader/slang/slang_compile_operation.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c index c0d469c8294..1002be16cb7 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); } -- 2.30.2