From b0f0b4044cae50af3443e1bfeb87b2d7d6042913 Mon Sep 17 00:00:00 2001
From: Oliver McFadden <z3ro.geek@gmail.com>
Date: Mon, 16 Jul 2007 05:04:10 +0000
Subject: r300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.

---
 src/mesa/drivers/dri/r300/r300_context.h  | 2 +-
 src/mesa/drivers/dri/r300/r300_vertprog.c | 2 +-
 src/mesa/drivers/dri/r300/r300_vertprog.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 6615bc79fb..00fa498e5f 100644
--- 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 a40fb4f4ac..dfea8b46c9 100644
--- 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 252d5a901f..0da158cc55 100644
--- 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
-- 
cgit v1.2.3