r300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.

2007-07-16 05:04:10 +00:00
parent 9457bf62bb
commit b0f0b4044c
3 changed files with 4 additions and 4 deletions
@@ -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;
 };

@@ -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;
@@ -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