commit b4026d9be828bd0b6f60158456edf24994efb053
author Brian Paul <brianp@vmware.com> Sat Mar 07 12:02:52 2009 -0700
committer Brian Paul <brianp@vmware.com> Sat Mar 07 12:02:52 2009 -0700
tree dd1cafcfb079259c28133a1a09cad3df88d0a712
parent 69e07bdeb42f2454f5052f86119adfb68f253098

mesa: gl_register_file enum typedef

src/mesa/shader/arbprogparse.c

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 75398cd..cd6289d 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -2246,7 +2246,7 @@
 static GLuint
 parse_masked_dst_reg (GLcontext * ctx, const GLubyte ** inst,
                       struct var_cache **vc_head, struct arb_program *Program,
-                      enum register_file *File, GLuint *Index, GLint *WriteMask)
+                      gl_register_file *File, GLuint *Index, GLint *WriteMask)
 {
    GLuint tmp, result;
    struct var_cache *dst;
@@ -2478,7 +2478,7 @@
 parse_src_reg (GLcontext * ctx, const GLubyte ** inst,
                struct var_cache **vc_head,
                struct arb_program *Program,
-               enum register_file * File, GLint * Index,
+               gl_register_file * File, GLint * Index,
                GLboolean *IsRelOffset )
 {
    struct var_cache *src;
@@ -2527,7 +2527,7 @@
                   return 1;
                }
 
-               *File = (enum register_file) src->param_binding_type;
+               *File = (gl_register_file) src->param_binding_type;
 
                switch (*(*inst)++) {
                   case ARRAY_INDEX_ABSOLUTE:
@@ -2573,7 +2573,7 @@
                if (parse_param_use (ctx, inst, vc_head, Program, &src))
                   return 1;
 
-               *File = (enum register_file) src->param_binding_type;
+               *File = (gl_register_file) src->param_binding_type;
                *Index = src->param_binding_begin;
                break;
          }
@@ -2598,7 +2598,7 @@
 
                /* XXX: We have to handle offsets someplace in here!  -- or are those above? */
             case vt_param:
-               *File = (enum register_file) src->param_binding_type;
+               *File = (gl_register_file) src->param_binding_type;
                *Index = src->param_binding_begin;
                break;
 
@@ -2623,7 +2623,7 @@
    }
 
    if (*File == PROGRAM_STATE_VAR) {
-      enum register_file file;
+      gl_register_file file;
 
       /* If we're referencing the Program->Parameters[] array, check if the
        * parameter is really a constant/literal.  If so, set File to CONSTANT.
@@ -2652,7 +2652,7 @@
                      struct arb_program *program,
                      struct prog_src_register *reg)
 {
-   enum register_file file;
+   gl_register_file file;
    GLint index;
    GLubyte negateMask;
    GLubyte swizzle[4];
@@ -2686,7 +2686,7 @@
                      struct arb_program *program,
                      struct prog_src_register *reg)
 {
-   enum register_file file;
+   gl_register_file file;
    GLint index;
    GLubyte negateMask;
    GLubyte swizzle[4];
@@ -2722,7 +2722,7 @@
 {
    GLint mask;
    GLuint idx;
-   enum register_file file;
+   gl_register_file file;
 
    if (parse_masked_dst_reg (ctx, inst, vc_head, program, &file, &idx, &mask))
       return 1;
@@ -3013,7 +3013,7 @@
 	 {
 	    GLubyte swizzle[4];
 	    GLubyte negateMask;
-            enum register_file file;
+            gl_register_file file;
 	    GLint index;
 
 	    if (parse_src_reg(ctx, inst, vc_head, Program, &file, &index, &rel))
@@ -3354,7 +3354,7 @@
 	    GLubyte swizzle[4]; 
 	    GLubyte negateMask;
 	    GLboolean relAddr;
-            enum register_file file;
+            gl_register_file file;
 	    GLint index;
 
 	    if (parse_dst_reg(ctx, inst, vc_head, Program, &vp->DstReg))