r300: Removed the ugly CARD32 type.

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index e26d563a47bbe22fd662b766078ed45b9356932c..0473bc23be8653b092dcc7b4c1aa71b5e6330867 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -92,12 +92,8 @@ typedef struct r300_context *r300ContextPtr;
 #define WARN_ONCE(a, ...) {}
 #endif
 
-  /* We should probably change types within vertex_shader
-      and pixel_shader structure later on */
-#define CARD32 GLuint
 #include "r300_vertprog.h"
 #include "r300_fragprog.h"
-#undef CARD32
 
 static __inline__ uint32_t r300PackFloat32(float fl)
 {

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.h b/src/mesa/drivers/dri/r300/r300_vertprog.h
index 55a215a4e8428c9cd9fac6fca0251673d02fa7d1..433e98960bc401d2b8a9981890595da826c9e72a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertprog.h
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.h
@@ -2,11 +2,11 @@
 #define __R300_VERTPROG_H_
 
 typedef struct {
-       CARD32 op;
-       CARD32 src1;
-       CARD32 src2;
-       CARD32 src3;
-       } VERTEX_SHADER_INSTRUCTION;
+       GLuint op;
+       GLuint src1;
+       GLuint src2;
+       GLuint src3;
+} VERTEX_SHADER_INSTRUCTION;
 
 #define VSF_FLAG_X     1
 #define VSF_FLAG_Y     2
@@ -21,7 +21,7 @@ typedef struct {
 #define VSF_OUT_CLASS_RESULT   2
 
 
-/* first CARD32 of an instruction */
+/* first DWORD of an instruction */
 
 /* possible operations: 
     DOT, MUL, ADD, MAD, FRC, MAX, MIN, SGE, SLT, EXP, LOG, LIT, POW, RCP, RSQ, EX2,
@@ -36,7 +36,7 @@ typedef struct {
 #define EASY_VSF_OP(op, out_reg_index, out_reg_fields, class) \
        MAKE_VSF_OP(R300_VPI_OUT_OP_##op, out_reg_index, VSF_FLAG_##out_reg_fields, VSF_OUT_CLASS_##class) \
 
-/* according to Nikolai, the subsequent 3 CARD32 are sources, use same define for each */
+/* according to Nikolai, the subsequent 3 DWORDs are sources, use same define for each */
 
 #define VSF_IN_CLASS_TMP       0
 #define VSF_IN_CLASS_ATTR      1