r300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 6615bc79fb3edc10153d12a37665dea909c12a0d..00fa498e5fe388ee1d72d7fd7aa8cd5e2eeb22c8 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -568,7 +568,7 @@ struct r300_vertex_shader_fragment {
        union {
                GLuint d[VSF_MAX_FRAGMENT_LENGTH];
                float f[VSF_MAX_FRAGMENT_LENGTH];
-               VERTEX_SHADER_INSTRUCTION i[VSF_MAX_FRAGMENT_LENGTH / 4];
+               struct r300_vertprog_instruction i[VSF_MAX_FRAGMENT_LENGTH / 4];
        } body;
 };
 

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index a40fb4f4ac99f4b56448d83786d239a749be404e..dfea8b46c9b97ed08074e59abcabb5f8a20e5ea0 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -415,7 +415,7 @@ static void r300TranslateVertexShader(struct r300_vertex_program *vp,
                                      struct prog_instruction *vpi)
 {
        int i, cur_reg = 0;
-       VERTEX_SHADER_INSTRUCTION *o_inst;
+       struct r300_vertprog_instruction *o_inst;
        unsigned long operands;
        int are_srcs_scalar;
        unsigned long hw_op;

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.h b/src/mesa/drivers/dri/r300/r300_vertprog.h
index 252d5a901f41b7c630282faf468ded5b2bb8e14f..0da158cc551487828e3790f178aebc3b6db20e01 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertprog.h
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.h
@@ -3,10 +3,10 @@
 
 #include "r300_reg.h"
 
-typedef struct {
+struct r300_vertprog_instruction {
        GLuint op;
        GLuint src[3];
-} VERTEX_SHADER_INSTRUCTION;
+};
 
 #define VSF_FLAG_X     1
 #define VSF_FLAG_Y     2