diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-16 15:50:14 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-16 15:50:14 -0700 |
| commit | b0caa10a85b39f0e657dc0c4816884c9356b0b1a (patch) | |
| tree | 812ec91f0cf375921533c2722de313461004aa20 /src/mesa/shader/slang/slang_compile_operation.c | |
| parent | 3616fb08da8ef392db1d5ccab55b8eb9f6a6f32b (diff) | |
| parent | 3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/shader/slang/slang_compile_operation.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_compile_operation.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c index 53cf6faff9..e650616880 100644 --- a/src/mesa/shader/slang/slang_compile_operation.c +++ b/src/mesa/shader/slang/slang_compile_operation.c @@ -44,6 +44,7 @@ slang_operation_construct(slang_operation * oper) oper->num_children = 0; oper->literal[0] = 0.0; oper->literal_size = 1; + oper->array_constructor = GL_FALSE; oper->a_id = SLANG_ATOM_NULL; oper->locals = _slang_variable_scope_new(NULL); if (oper->locals == NULL) @@ -90,7 +91,7 @@ slang_replace_scope(slang_operation *oper, 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); + var = _slang_variable_locate(oper->locals, oper->a_id, GL_TRUE); if (var && var->initializer) { slang_replace_scope(var->initializer, oldScope, newScope); } |