diff options
| author | Karl Schultze <k.w.schultz@comcast.net> | 2007-04-24 08:19:07 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-04-24 08:19:07 -0600 |
| commit | 208ea84524728abc3ae46549c00eebe16c9576b8 (patch) | |
| tree | 071e3d3a41313340fd1f217293ecd4e77a5a1d25 | |
| parent | 7868ab6617e1b6e80c43e3daf7c9cca3693a6c11 (diff) | |
fix double const, move an assertion
| -rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index ba97d6257bd..c6151f8feaa 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -1614,7 +1614,7 @@ _slang_gen_continue(slang_assemble_ctx * A, const slang_operation *oper) * Determine if the given operation is of a specific type. */ static GLboolean -is_operation_type(const const slang_operation *oper, slang_operation_type type) +is_operation_type(const slang_operation *oper, slang_operation_type type) { if (oper->type == type) return GL_TRUE; @@ -2911,9 +2911,9 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var, store = _slang_new_ir_storage(PROGRAM_OUTPUT, index, size); } else { - assert(type == SLANG_UNIT_FRAGMENT_BUILTIN); GLint index = _slang_output_index(varName, GL_FRAGMENT_PROGRAM_ARB); GLint size = 4; /* XXX? */ + assert(type == SLANG_UNIT_FRAGMENT_BUILTIN); store = _slang_new_ir_storage(PROGRAM_OUTPUT, index, size); } if (dbg) printf("OUTPUT "); |