mesa: Branch 'master'

[Brian Paul]

 src/mesa/shader/slang/slang_codegen.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 208ea84524728abc3ae46549c00eebe16c9576b8 (from 7868ab6617e1b6e80c43e3daf7c9cca3693a6c11)
Author: Karl Schultze <k.w.schultz at comcast.net>
Date:   Tue Apr 24 08:19:07 2007 -0600

    fix double const, move an assertion

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index ba97d62..c6151f8 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 *
  * 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_ass
          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 ");