Unify vertex/fragment program instuctions.

Based on patch by Ian (#4967) but also unify instruction opcodes.

6 files changed, 128 insertions, 130 deletions

diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index 77a72d61824..4602b3260ee 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -36,7 +36,7 @@
 #include "i915_context.h"
 #include "i915_program.h"
 
-#include "nvfragprog.h"
+#include "program_instruction.h"
 #include "program.h"
 #include "arbfragparse.h"
 
@@ -63,7 +63,7 @@ static const GLfloat cos_constants[4] = {  1.0,
  * constants, apply swizzling and negation as needed.
  */
 static GLuint src_vector( struct i915_fragment_program *p,
-			  const struct fp_src_register *source,
+			  const struct prog_src_register *source,
 			  const struct fragment_program *program )
 {
    GLuint src;
@@ -156,7 +156,7 @@ static GLuint src_vector( struct i915_fragment_program *p,
 
 
 static GLuint get_result_vector( struct i915_fragment_program *p,
-				 const struct fp_instruction *inst )
+				 const struct prog_instruction *inst )
 {
    switch (inst->DstReg.File) {
    case PROGRAM_OUTPUT:
@@ -178,7 +178,7 @@ static GLuint get_result_vector( struct i915_fragment_program *p,
    }
 }
    
-static GLuint get_result_flags( const struct fp_instruction *inst )
+static GLuint get_result_flags( const struct prog_instruction *inst )
 {
    GLuint flags = 0;
 
@@ -250,7 +250,7 @@ do {									\
 static void upload_program( struct i915_fragment_program *p )
 {
    const struct fragment_program *program = p->ctx->FragmentProgram._Current;
-   const struct fp_instruction *inst = program->Instructions;
+   const struct prog_instruction *inst = program->Instructions;
 
 /*    _mesa_debug_fp_inst(program->Base.NumInstructions, inst); */
 
@@ -258,7 +258,7 @@ static void upload_program( struct i915_fragment_program *p )
     * loaded, as the flagging of an error isn't sufficient to stop
     * this being uploaded to hardware.
     */
-   if (inst[0].Opcode == FP_OPCODE_END) {
+   if (inst[0].Opcode == OPCODE_END) {
       GLuint tmp = i915_get_utemp( p );
       i915_emit_arith( p,
 		      A0_MOV,
@@ -273,7 +273,7 @@ static void upload_program( struct i915_fragment_program *p )
       GLuint tmp = 0;
 
       switch (inst->Opcode) {
-      case FP_OPCODE_ABS: 
+      case OPCODE_ABS: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 i915_emit_arith( p, 
 			 A0_MAX,
@@ -282,11 +282,11 @@ static void upload_program( struct i915_fragment_program *p )
 			 src0, negate(src0, 1,1,1,1), 0);
 	 break;
 
-      case FP_OPCODE_ADD: 
+      case OPCODE_ADD: 
 	 EMIT_2ARG_ARITH( A0_ADD );
 	 break;
 
-      case FP_OPCODE_CMP: 
+      case OPCODE_CMP: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 src1 = src_vector( p, &inst->SrcReg[1], program);
 	 src2 = src_vector( p, &inst->SrcReg[2], program);
@@ -297,7 +297,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 src0, src2, src1);	/* NOTE: order of src2, src1 */
 	 break;
 
-      case FP_OPCODE_COS:
+      case OPCODE_COS:
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 tmp = i915_get_utemp( p );
 
@@ -356,15 +356,15 @@ static void upload_program( struct i915_fragment_program *p )
 
 	 break;
 
-      case FP_OPCODE_DP3: 
+      case OPCODE_DP3: 
 	 EMIT_2ARG_ARITH( A0_DP3 );
 	 break;
 
-      case FP_OPCODE_DP4: 
+      case OPCODE_DP4: 
 	 EMIT_2ARG_ARITH( A0_DP4 );
 	 break;
 
-      case FP_OPCODE_DPH:  
+      case OPCODE_DPH:  
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 src1 = src_vector( p, &inst->SrcReg[1], program);
 
@@ -375,7 +375,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 swizzle(src0, X,Y,Z,ONE), src1, 0);
 	 break;
 
-      case FP_OPCODE_DST: 
+      case OPCODE_DST: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 src1 = src_vector( p, &inst->SrcReg[1], program);
 
@@ -393,7 +393,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 0);
 	 break;
 
-      case FP_OPCODE_EX2: 
+      case OPCODE_EX2: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 
 	 i915_emit_arith( p, 
@@ -403,15 +403,15 @@ static void upload_program( struct i915_fragment_program *p )
 			 swizzle(src0,X,X,X,X), 0, 0);
 	 break;
 
-      case FP_OPCODE_FLR: 
+      case OPCODE_FLR: 
 	 EMIT_1ARG_ARITH( A0_FLR );
 	 break;
 
-      case FP_OPCODE_FRC: 
+      case OPCODE_FRC: 
 	 EMIT_1ARG_ARITH( A0_FRC );
 	 break;
 
-      case FP_OPCODE_KIL:
+      case OPCODE_KIL:
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 tmp = i915_get_utemp( p );
 
@@ -422,7 +422,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 T0_TEXKILL );
 	 break;
 
-      case FP_OPCODE_LG2: 
+      case OPCODE_LG2: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 
 	 i915_emit_arith( p, 
@@ -432,7 +432,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 swizzle(src0,X,X,X,X), 0, 0);
 	 break;
 
-      case FP_OPCODE_LIT: 
+      case OPCODE_LIT: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 tmp = i915_get_utemp( p );
 
@@ -465,7 +465,7 @@ static void upload_program( struct i915_fragment_program *p )
 		     
 	 break;
 
-      case FP_OPCODE_LRP: 
+      case OPCODE_LRP: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 src1 = src_vector( p, &inst->SrcReg[1], program);
 	 src2 = src_vector( p, &inst->SrcReg[2], program);
@@ -489,15 +489,15 @@ static void upload_program( struct i915_fragment_program *p )
 			 negate(src2, 1,1,1,1), src0, tmp );
 	 break;
 
-      case FP_OPCODE_MAD:
+      case OPCODE_MAD:
 	 EMIT_3ARG_ARITH( A0_MAD );
 	 break;
 
-      case FP_OPCODE_MAX:
+      case OPCODE_MAX:
 	 EMIT_2ARG_ARITH( A0_MAX );
 	 break;
 
-      case FP_OPCODE_MIN: 
+      case OPCODE_MIN: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 src1 = src_vector( p, &inst->SrcReg[1], program);
 	 tmp = i915_get_utemp( p );
@@ -516,15 +516,15 @@ static void upload_program( struct i915_fragment_program *p )
 			 negate(tmp, 1,1,1,1), 0, 0);
 	 break;
 
-      case FP_OPCODE_MOV: 
+      case OPCODE_MOV: 
 	 EMIT_1ARG_ARITH( A0_MOV );
 	 break;
 
-      case FP_OPCODE_MUL: 
+      case OPCODE_MUL: 
 	 EMIT_2ARG_ARITH( A0_MUL );
 	 break;
 
-      case FP_OPCODE_POW: 
+      case OPCODE_POW: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 src1 = src_vector( p, &inst->SrcReg[1], program);
 	 tmp = i915_get_utemp( p );
@@ -551,7 +551,7 @@ static void upload_program( struct i915_fragment_program *p )
 
 	 break;
 
-      case FP_OPCODE_RCP: 
+      case OPCODE_RCP: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 
 	 i915_emit_arith( p, 
@@ -561,7 +561,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 swizzle(src0,X,X,X,X), 0, 0);
 	 break;
 
-      case FP_OPCODE_RSQ: 
+      case OPCODE_RSQ: 
 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 
@@ -572,7 +572,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 swizzle(src0,X,X,X,X), 0, 0);
 	 break;
 	 
-      case FP_OPCODE_SCS:
+      case OPCODE_SCS:
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 tmp = i915_get_utemp( p );
 
@@ -634,11 +634,11 @@ static void upload_program( struct i915_fragment_program *p )
 	 }
 	 break;
 
-      case FP_OPCODE_SGE: 
+      case OPCODE_SGE: 
 	 EMIT_2ARG_ARITH( A0_SGE );
 	 break;
 
-      case FP_OPCODE_SIN:
+      case OPCODE_SIN:
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 tmp = i915_get_utemp( p );
 
@@ -696,11 +696,11 @@ static void upload_program( struct i915_fragment_program *p )
 			 i915_emit_const4fv( p, sin_constants ), 0);
 	 break;
 
-      case FP_OPCODE_SLT: 
+      case OPCODE_SLT: 
 	 EMIT_2ARG_ARITH( A0_SLT );
 	 break;
 
-      case FP_OPCODE_SUB: 
+      case OPCODE_SUB: 
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 src1 = src_vector( p, &inst->SrcReg[1], program);
 
@@ -711,23 +711,23 @@ static void upload_program( struct i915_fragment_program *p )
 			 src0, negate(src1, 1,1,1,1), 0);
 	 break;
 
-      case FP_OPCODE_SWZ: 
+      case OPCODE_SWZ: 
 	 EMIT_1ARG_ARITH( A0_MOV ); /* extended swizzle handled natively */
 	 break;
 
-      case FP_OPCODE_TEX: 
+      case OPCODE_TEX: 
 	 EMIT_TEX( T0_TEXLD );
 	 break;
 
-      case FP_OPCODE_TXB:
+      case OPCODE_TXB:
 	 EMIT_TEX( T0_TEXLDB );
 	 break;
 
-      case FP_OPCODE_TXP:
+      case OPCODE_TXP:
 	 EMIT_TEX( T0_TEXLDP );
 	 break;
 
-      case FP_OPCODE_XPD:
+      case OPCODE_XPD:
 	 /* Cross product:
 	  *      result.x = src0.y * src1.z - src0.z * src1.y;
 	  *      result.y = src0.z * src1.x - src0.x * src1.z;
@@ -753,7 +753,7 @@ static void upload_program( struct i915_fragment_program *p )
 			 negate(tmp,1,1,1,0));
 	 break;
 
-      case FP_OPCODE_END:
+      case OPCODE_END:
 	 return;
 	 
       default:
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 35b254616b7..2d896c46e36 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -49,7 +49,7 @@
 #include "arbfragparse.h"
 
 #include "program.h"
-#include "nvfragprog.h"
+#include "program_instruction.h"
 #include "r300_context.h"
 #if USE_ARB_F_P == 1
 #include "r300_fragprog.h"
@@ -400,7 +400,7 @@ static pfs_reg_t swizzle(struct r300_fragment_program *rp,
 }
 				
 static pfs_reg_t t_src(struct r300_fragment_program *rp,
-						struct fp_src_register fpsrc) {
+						struct prog_src_register fpsrc) {
 	pfs_reg_t r = pfs_default_reg;
 
 	switch (fpsrc.File) {
@@ -442,7 +442,7 @@ static pfs_reg_t t_src(struct r300_fragment_program *rp,
 }
 
 static pfs_reg_t t_dst(struct r300_fragment_program *rp,
-				struct fp_dst_register dest) {
+				struct prog_dst_register dest) {
 	pfs_reg_t r = pfs_default_reg;
 	
 	switch (dest.File) {
@@ -489,7 +489,7 @@ static void sync_streams(struct r300_fragment_program *rp) {
 }
 
 static void emit_tex(struct r300_fragment_program *rp,
-				struct fp_instruction *fpi,
+				struct prog_instruction *fpi,
 				int opcode)
 {
 	pfs_reg_t coord = t_src(rp, fpi->SrcReg[0]);
@@ -747,37 +747,37 @@ static void emit_arith(struct r300_fragment_program *rp, int op,
 static GLboolean parse_program(struct r300_fragment_program *rp)
 {	
 	struct fragment_program *mp = &rp->mesa_program;
-	const struct fp_instruction *inst = mp->Instructions;
-	struct fp_instruction *fpi;
+	const struct prog_instruction *inst = mp->Instructions;
+	struct prog_instruction *fpi;
 	pfs_reg_t src0, src1, src2, dest, temp;
 	int flags = 0;
 
-	if (!inst || inst[0].Opcode == FP_OPCODE_END) {
+	if (!inst || inst[0].Opcode == OPCODE_END) {
 		ERROR("empty program?\n");
 		return GL_FALSE;
 	}
 
-	for (fpi=mp->Instructions; fpi->Opcode != FP_OPCODE_END; fpi++) {
+	for (fpi=mp->Instructions; fpi->Opcode != OPCODE_END; fpi++) {
 		if (fpi->Saturate) {
 			flags = PFS_FLAG_SAT;
 		}
 		
 		switch (fpi->Opcode) {
-		case FP_OPCODE_ABS:
+		case OPCODE_ABS:
 			ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
 			break;
-		case FP_OPCODE_ADD:
+		case OPCODE_ADD:
 			emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
 							t_src(rp, fpi->SrcReg[0]),
 							pfs_one,
 							t_src(rp, fpi->SrcReg[1]),
 							flags);
 			break;
-		case FP_OPCODE_CMP:
-		case FP_OPCODE_COS:
+		case OPCODE_CMP:
+		case OPCODE_COS:
 			ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
 			break;
-		case FP_OPCODE_DP3:
+		case OPCODE_DP3:
 			dest = t_dst(rp, fpi->DstReg);
 			if (fpi->DstReg.WriteMask & WRITEMASK_W) {
 				/* I assume these need to share the same alu slot */
@@ -792,18 +792,18 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
 							t_src(rp, fpi->SrcReg[1]),
 							pfs_zero, flags);
 			break;
-		case FP_OPCODE_DP4:
-		case FP_OPCODE_DPH:
-		case FP_OPCODE_DST:
-		case FP_OPCODE_EX2:
-		case FP_OPCODE_FLR:
-		case FP_OPCODE_FRC:
-		case FP_OPCODE_KIL:
-		case FP_OPCODE_LG2:
-		case FP_OPCODE_LIT:
+		case OPCODE_DP4:
+		case OPCODE_DPH:
+		case OPCODE_DST:
+		case OPCODE_EX2:
+		case OPCODE_FLR:
+		case OPCODE_FRC:
+		case OPCODE_KIL:
+		case OPCODE_LG2:
+		case OPCODE_LIT:
 			ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
 			break;
-		case FP_OPCODE_LRP:
+		case OPCODE_LRP:
 			/* TODO: use the special LRP form if possible */
 			src0 = t_src(rp, fpi->SrcReg[0]);
 			src1 = t_src(rp, fpi->SrcReg[1]);
@@ -819,31 +819,31 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
 							src0, src1, temp, flags);
 			free_temp(rp, temp);
 			break;			
-		case FP_OPCODE_MAD:
+		case OPCODE_MAD:
 			emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
 							t_src(rp, fpi->SrcReg[0]),
 							t_src(rp, fpi->SrcReg[1]),
 							t_src(rp, fpi->SrcReg[2]),
 							flags);
 			break;
-		case FP_OPCODE_MAX:
-		case FP_OPCODE_MIN:
+		case OPCODE_MAX:
+		case OPCODE_MIN:
 			ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
 			break;
-		case FP_OPCODE_MOV:
-		case FP_OPCODE_SWZ:
+		case OPCODE_MOV:
+		case OPCODE_SWZ:
 			emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
 							t_src(rp, fpi->SrcReg[0]), pfs_one, pfs_zero, 
 							flags);
 			break;
-		case FP_OPCODE_MUL:
+		case OPCODE_MUL:
 			emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
 							t_src(rp, fpi->SrcReg[0]),
 							t_src(rp, fpi->SrcReg[1]),
 							pfs_zero,
 							flags);
 			break;
-		case FP_OPCODE_POW:
+		case OPCODE_POW:
 			src0 = t_src(rp, fpi->SrcReg[0]);
 			src1 = t_src(rp, fpi->SrcReg[1]);
 			dest = t_dst(rp, fpi->DstReg);
@@ -857,38 +857,38 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
 							temp, pfs_zero, pfs_zero, 0);
 			free_temp(rp, temp);
 			break;
-		case FP_OPCODE_RCP:
+		case OPCODE_RCP:
 			ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
 			break;
-		case FP_OPCODE_RSQ:
+		case OPCODE_RSQ:
 			emit_arith(rp, PFS_OP_RSQ, t_dst(rp, fpi->DstReg),
 							fpi->DstReg.WriteMask,
 							t_src(rp, fpi->SrcReg[0]), pfs_zero, pfs_zero,
 							flags | PFS_FLAG_ABS);
 			break;
-		case FP_OPCODE_SCS:
-		case FP_OPCODE_SGE:
-		case FP_OPCODE_SIN:
-		case FP_OPCODE_SLT:
+		case OPCODE_SCS:
+		case OPCODE_SGE:
+		case OPCODE_SIN:
+		case OPCODE_SLT:
 			ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
 			break;
-		case FP_OPCODE_SUB:
+		case OPCODE_SUB:
 			emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
 							t_src(rp, fpi->SrcReg[0]),
 							pfs_one,
 							negate(t_src(rp, fpi->SrcReg[1])),
 							flags);
 			break;
-		case FP_OPCODE_TEX:
+		case OPCODE_TEX:
 			emit_tex(rp, fpi, R300_FPITX_OP_TEX);
 			break;
-		case FP_OPCODE_TXB:
+		case OPCODE_TXB:
 			emit_tex(rp, fpi, R300_FPITX_OP_TXB);
 			break;
-		case FP_OPCODE_TXP:
+		case OPCODE_TXP:
 			emit_tex(rp, fpi, R300_FPITX_OP_TXP);
 			break;
-		case FP_OPCODE_XPD:
+		case OPCODE_XPD:
 			ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
 			break;
 		default:
@@ -909,7 +909,7 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
 static void init_program(struct r300_fragment_program *rp)
 {
 	struct fragment_program *mp = &rp->mesa_program;	
-	struct fp_instruction *fpi;
+	struct prog_instruction *fpi;
 	GLuint InputsRead = mp->InputsRead;
 	GLuint temps_used = 0; /* for rp->temps[] */
 	int i;
@@ -983,7 +983,7 @@ static void init_program(struct r300_fragment_program *rp)
 		ERROR("No instructions found in program\n");
 		return;
 	}	
-	for (fpi=mp->Instructions;fpi->Opcode != FP_OPCODE_END; fpi++) {
+	for (fpi=mp->Instructions;fpi->Opcode != OPCODE_END; fpi++) {
 		for (i=0;i<3;i++) {
 			if (fpi->SrcReg[i].File == PROGRAM_TEMPORARY) {
 				if (!(temps_used & (1 << fpi->SrcReg[i].Index))) {
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.h b/src/mesa/drivers/dri/r300/r300_fragprog.h
index ed318eb6a75..fb9d067f719 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.h
@@ -7,7 +7,7 @@
 
 #include "program.h"
 #include "r300_context.h"
-#include "nvfragprog.h"
+#include "program_instruction.h"
 
 /* representation of a register for emit_arith/swizzle */
 typedef struct _pfs_reg_t {
diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c
index b8e951d1712..a5549947f9d 100644
--- a/src/mesa/drivers/dri/r300/r300_shader.c
+++ b/src/mesa/drivers/dri/r300/r300_shader.c
@@ -4,7 +4,7 @@
 
 #include "program.h"
 #include "r300_context.h"
-#include "nvvertprog.h"
+#include "program_instruction.h"
 #if USE_ARB_F_P == 1
 #include "r300_fragprog.h"
 #endif
diff --git a/src/mesa/drivers/dri/r300/r300_vertexprog.c b/src/mesa/drivers/dri/r300/r300_vertexprog.c
index 7b8ebe343aa..5ebd100ed17 100644
--- a/src/mesa/drivers/dri/r300/r300_vertexprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertexprog.c
@@ -36,12 +36,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "program.h"
 #include "r300_context.h"
 #include "r300_program.h"
-#include "nvvertprog.h"
+#include "program_instruction.h"
 
 #define SCALAR_FLAG (1<<31)
 #define FLAG_MASK (1<<31)
 #define OP_MASK	(0xf)  /* we are unlikely to have more than 15 */
-#define OPN(operator, ip, op) {#operator, VP_OPCODE_##operator, ip, op}
+#define OPN(operator, ip, op) {#operator, OPCODE_##operator, ip, op}
 
 static struct{
 	char *name;
@@ -186,7 +186,7 @@ void dump_program_params(GLcontext *ctx, struct vertex_program *vp)
 
 void debug_vp(GLcontext *ctx, struct vertex_program *vp)
 {
-	struct vp_instruction *vpi;
+	struct prog_instruction *vpi;
 	int i, operand_index;
 	int operator_index;
 	
@@ -195,7 +195,7 @@ void debug_vp(GLcontext *ctx, struct vertex_program *vp)
 	vpi=vp->Instructions;
 	
 	for(;; vpi++){
-		if(vpi->Opcode == VP_OPCODE_END)
+		if(vpi->Opcode == OPCODE_END)
 			break;
 		
 		for(i=0; i < sizeof(op_names) / sizeof(*op_names); i++){
@@ -315,7 +315,7 @@ static unsigned long t_dst_class(enum register_file file)
 	}
 }
 
-static unsigned long t_dst_index(struct r300_vertex_program *vp, struct vp_dst_register *dst)
+static unsigned long t_dst_index(struct r300_vertex_program *vp, struct prog_dst_register *dst)
 {
 	if(dst->File == PROGRAM_OUTPUT) {
 		if (vp->outputs[dst->Index] != -1)
@@ -385,7 +385,7 @@ static void vp_dump_inputs(struct r300_vertex_program *vp, char *caller)
 	
 }
 
-static unsigned long t_src_index(struct r300_vertex_program *vp, struct vp_src_register *src)
+static unsigned long t_src_index(struct r300_vertex_program *vp, struct prog_src_register *src)
 {
 	int i;
 	int max_reg=-1;
@@ -408,7 +408,7 @@ static unsigned long t_src_index(struct r300_vertex_program *vp, struct vp_src_r
 	}
 }
 
-static unsigned long t_src(struct r300_vertex_program *vp, struct vp_src_register *src)
+static unsigned long t_src(struct r300_vertex_program *vp, struct prog_src_register *src)
 {
 	
 	return MAKE_VSF_SOURCE(t_src_index(vp, src),
@@ -420,7 +420,7 @@ static unsigned long t_src(struct r300_vertex_program *vp, struct vp_src_registe
 				src->Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE);
 }
 
-static unsigned long t_src_scalar(struct r300_vertex_program *vp, struct vp_src_register *src)
+static unsigned long t_src_scalar(struct r300_vertex_program *vp, struct prog_src_register *src)
 {
 			
 	return MAKE_VSF_SOURCE(t_src_index(vp, src),
@@ -436,21 +436,21 @@ static unsigned long t_opcode(enum vp_opcode opcode)
 {
 
 	switch(opcode){
-		case VP_OPCODE_DST: return R300_VPI_OUT_OP_DST;
-		case VP_OPCODE_EX2: return R300_VPI_OUT_OP_EX2;
-		case VP_OPCODE_EXP: return R300_VPI_OUT_OP_EXP;
-		case VP_OPCODE_FRC: return R300_VPI_OUT_OP_FRC;
-		case VP_OPCODE_LG2: return R300_VPI_OUT_OP_LG2;
-		case VP_OPCODE_LOG: return R300_VPI_OUT_OP_LOG;
-		case VP_OPCODE_MAX: return R300_VPI_OUT_OP_MAX;
-		case VP_OPCODE_MIN: return R300_VPI_OUT_OP_MIN;
-		case VP_OPCODE_MUL: return R300_VPI_OUT_OP_MUL;
-		case VP_OPCODE_POW: return R300_VPI_OUT_OP_POW;
-		case VP_OPCODE_RCP: return R300_VPI_OUT_OP_RCP;
-		case VP_OPCODE_RSQ: return R300_VPI_OUT_OP_RSQ;
-		case VP_OPCODE_SGE: return R300_VPI_OUT_OP_SGE;
-		case VP_OPCODE_SLT: return R300_VPI_OUT_OP_SLT;
-		case VP_OPCODE_DP4: return R300_VPI_OUT_OP_DOT;
+		case OPCODE_DST: return R300_VPI_OUT_OP_DST;
+		case OPCODE_EX2: return R300_VPI_OUT_OP_EX2;
+		case OPCODE_EXP: return R300_VPI_OUT_OP_EXP;
+		case OPCODE_FRC: return R300_VPI_OUT_OP_FRC;
+		case OPCODE_LG2: return R300_VPI_OUT_OP_LG2;
+		case OPCODE_LOG: return R300_VPI_OUT_OP_LOG;
+		case OPCODE_MAX: return R300_VPI_OUT_OP_MAX;
+		case OPCODE_MIN: return R300_VPI_OUT_OP_MIN;
+		case OPCODE_MUL: return R300_VPI_OUT_OP_MUL;
+		case OPCODE_POW: return R300_VPI_OUT_OP_POW;
+		case OPCODE_RCP: return R300_VPI_OUT_OP_RCP;
+		case OPCODE_RSQ: return R300_VPI_OUT_OP_RSQ;
+		case OPCODE_SGE: return R300_VPI_OUT_OP_SGE;
+		case OPCODE_SLT: return R300_VPI_OUT_OP_SLT;
+		case OPCODE_DP4: return R300_VPI_OUT_OP_DOT;
 		
 		default: 
 			fprintf(stderr, "%s: Should not be called with opcode %d!", __FUNCTION__, opcode);
@@ -484,7 +484,7 @@ static unsigned long op_operands(enum vp_opcode opcode)
 void translate_vertex_shader(struct r300_vertex_program *vp)
 {
 	struct vertex_program *mesa_vp=(void *)vp;
-	struct vp_instruction *vpi;
+	struct prog_instruction *vpi;
 	int i, cur_reg=0;
 	VERTEX_SHADER_INSTRUCTION *o_inst;
 	unsigned long operands;
@@ -495,7 +495,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 	   Smart enough to realize that it doesnt need it? */
 	int u_temp_i=VSF_MAX_FRAGMENT_TEMPS-1;
 #ifdef SRCS_WRITABLE
-	struct vp_src_register src[3];
+	struct prog_src_register src[3];
 #else	
 #define src	vpi->SrcReg	
 #endif			
@@ -541,7 +541,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			vp->outputs[i] = cur_reg++;
 	
 	o_inst=vp->program.body.i;
-	for(vpi=mesa_vp->Instructions; vpi->Opcode != VP_OPCODE_END; vpi++, o_inst++){
+	for(vpi=mesa_vp->Instructions; vpi->Opcode != OPCODE_END; vpi++, o_inst++){
 		
 		operands=op_operands(vpi->Opcode);
 		are_srcs_scalar=operands & SCALAR_FLAG;
@@ -599,7 +599,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 		/* these ops need special handling.
 		   Ops that need temp vars should probably be given reg indexes starting at the end of tmp area. */
 		switch(vpi->Opcode){
-		case VP_OPCODE_MOV://ADD RESULT 1.X Y Z W PARAM 0{} {X Y Z W} PARAM 0{} {ZERO ZERO ZERO ZERO} 
+		case OPCODE_MOV://ADD RESULT 1.X Y Z W PARAM 0{} {X Y Z W} PARAM 0{} {ZERO ZERO ZERO ZERO} 
 #if 1
 			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_ADD, t_dst_index(vp, &vpi->DstReg),
 					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
@@ -630,7 +630,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 
 			goto next;
 			
-		case VP_OPCODE_ADD:
+		case OPCODE_ADD:
 			hw_op=(src[0].File == PROGRAM_TEMPORARY &&
 				src[1].File == PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 : R300_VPI_OUT_OP_MAD;
 			
@@ -644,7 +644,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			o_inst->src3=t_src(vp, &src[1]);
 			goto next;
 			
-		case VP_OPCODE_MAD:
+		case OPCODE_MAD:
 			hw_op=(src[0].File == PROGRAM_TEMPORARY &&
 				src[1].File == PROGRAM_TEMPORARY &&
 				src[2].File == PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 : R300_VPI_OUT_OP_MAD;
@@ -656,7 +656,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			o_inst->src3=t_src(vp, &src[2]);
 			goto next;
 			
-		case VP_OPCODE_MUL: /* HW mul can take third arg but appears to have some other limitations. */
+		case OPCODE_MUL: /* HW mul can take third arg but appears to have some other limitations. */
 			hw_op=(src[0].File == PROGRAM_TEMPORARY &&
 				src[1].File == PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 : R300_VPI_OUT_OP_MAD;
 			
@@ -671,7 +671,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 					t_src_class(src[1].File), VSF_FLAG_NONE);
 			goto next;
 			
-		case VP_OPCODE_DP3://DOT RESULT 1.X Y Z W PARAM 0{} {X Y Z ZERO} PARAM 0{} {X Y Z ZERO} 
+		case OPCODE_DP3://DOT RESULT 1.X Y Z W PARAM 0{} {X Y Z ZERO} PARAM 0{} {X Y Z ZERO} 
 			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_DOT, t_dst_index(vp, &vpi->DstReg),
 					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
 			
@@ -694,7 +694,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			o_inst->src3=0;
 			goto next;
 
-		case VP_OPCODE_SUB://ADD RESULT 1.X Y Z W TMP 0{} {X Y Z W} PARAM 1{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W
+		case OPCODE_SUB://ADD RESULT 1.X Y Z W TMP 0{} {X Y Z W} PARAM 1{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W
 #if 1
 			hw_op=(src[0].File == PROGRAM_TEMPORARY &&
 				src[1].File == PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 : R300_VPI_OUT_OP_MAD;
@@ -729,7 +729,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 #endif
 			goto next;
 			
-		case VP_OPCODE_ABS://MAX RESULT 1.X Y Z W PARAM 0{} {X Y Z W} PARAM 0{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W
+		case OPCODE_ABS://MAX RESULT 1.X Y Z W PARAM 0{} {X Y Z W} PARAM 0{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W
 			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_MAX, t_dst_index(vp, &vpi->DstReg),
 					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
 			
@@ -744,7 +744,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			o_inst->src3=0;
 			goto next;
 			
-		case VP_OPCODE_FLR:
+		case OPCODE_FLR:
 		/* FRC TMP 0.X Y Z W PARAM 0{} {X Y Z W} 
 		   ADD RESULT 1.X Y Z W PARAM 0{} {X Y Z W} TMP 0{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W */
 
@@ -773,7 +773,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			u_temp_i--;
 			goto next;
 			
-		case VP_OPCODE_LG2:// LG2 RESULT 1.X Y Z W PARAM 0{} {X X X X}
+		case OPCODE_LG2:// LG2 RESULT 1.X Y Z W PARAM 0{} {X X X X}
 			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_LG2, t_dst_index(vp, &vpi->DstReg),
 					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
 			
@@ -788,7 +788,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			o_inst->src3=0;
 			goto next;
 			
-		case VP_OPCODE_LIT://LIT TMP 1.Y Z TMP 1{} {X W Z Y} TMP 1{} {Y W Z X} TMP 1{} {Y X Z W} 
+		case OPCODE_LIT://LIT TMP 1.Y Z TMP 1{} {X W Z Y} TMP 1{} {Y W Z X} TMP 1{} {Y X Z W} 
 			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_LIT, t_dst_index(vp, &vpi->DstReg),
 					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
 			/* NOTE: Users swizzling might not work. */
@@ -815,7 +815,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 					src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE);
 			goto next;
 			
-		case VP_OPCODE_DPH://DOT RESULT 1.X Y Z W PARAM 0{} {X Y Z ONE} PARAM 0{} {X Y Z W} 
+		case OPCODE_DPH://DOT RESULT 1.X Y Z W PARAM 0{} {X Y Z ONE} PARAM 0{} {X Y Z W} 
 			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_DOT, t_dst_index(vp, &vpi->DstReg),
 					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
 			
@@ -830,7 +830,7 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 			o_inst->src3=0;
 			goto next;
 			
-		case VP_OPCODE_XPD:
+		case OPCODE_XPD:
 			/* mul r0, r1.yzxw, r2.zxyw
 			   mad r0, -r2.yzxw, r1.zxyw, r0
 			   NOTE: might need MAD_2
@@ -892,15 +892,15 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
 		
 			goto next;
 
-		case VP_OPCODE_ARL:
-		case VP_OPCODE_SWZ:
-		case VP_OPCODE_RCC:
-		case VP_OPCODE_PRINT:
+		case OPCODE_ARL:
+		case OPCODE_SWZ:
+		case OPCODE_RCC:
+		case OPCODE_PRINT:
 			//vp->num_temporaries++;
 			fprintf(stderr, "Dont know how to handle op %d yet\n", vpi->Opcode);
 			exit(-1);
 		break;
-		case VP_OPCODE_END:
+		case OPCODE_END:
 			break;
 		default:
 			break;
diff --git a/src/mesa/drivers/glide/fxtris.c b/src/mesa/drivers/glide/fxtris.c
index 180637565cb..0b9b3be5829 100644
--- a/src/mesa/drivers/glide/fxtris.c
+++ b/src/mesa/drivers/glide/fxtris.c
@@ -35,8 +35,6 @@
 #include "mtypes.h"
 #include "macros.h"
 #include "colormac.h"
-#include "nvfragprog.h"
-
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
 #include "tnl/t_context.h"