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_simplify.c | |
| parent | 3616fb08da8ef392db1d5ccab55b8eb9f6a6f32b (diff) | |
| parent | 3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/shader/slang/slang_simplify.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_simplify.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/slang_simplify.c b/src/mesa/shader/slang/slang_simplify.c index 6ef95c48f9..b8a21f642c 100644 --- a/src/mesa/shader/slang/slang_simplify.c +++ b/src/mesa/shader/slang/slang_simplify.c @@ -135,7 +135,7 @@ _slang_simplify(slang_operation *oper, /* look for user-defined constant */ { 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) { if (var->type.qualifier == SLANG_QUAL_CONST && var->initializer && @@ -380,7 +380,7 @@ _slang_cast_func_params(slang_operation *callOper, const slang_function *fun, /* Get type of arg[i] */ if (!slang_typeinfo_construct(&argType)) return GL_FALSE; - if (!_slang_typeof_operation_(&callOper->children[i], space, + if (!_slang_typeof_operation(&callOper->children[i], space, &argType, atoms, log)) { slang_typeinfo_destruct(&argType); return GL_FALSE; @@ -464,7 +464,7 @@ _slang_adapt_call(slang_operation *callOper, const slang_function *fun, /* Get type of arg[i] */ if (!slang_typeinfo_construct(&argType)) return GL_FALSE; - if (!_slang_typeof_operation_(&callOper->children[i], space, + if (!_slang_typeof_operation(&callOper->children[i], space, &argType, atoms, log)) { slang_typeinfo_destruct(&argType); return GL_FALSE; |