r300: Indented r300_vertprog.[ch].

2 files changed, 674 insertions, 491 deletions

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 39d127c64a..4d0c9c2719 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -56,62 +56,66 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define SCALAR_FLAG (1<<31)
 #define FLAG_MASK (1<<31)
-#define OP_MASK	(0xf)  /* we are unlikely to have more than 15 */
+#define OP_MASK	(0xf)		/* we are unlikely to have more than 15 */
 #define OPN(operator, ip) {#operator, OPCODE_##operator, ip}
 
-static struct{
+static struct {
 	char *name;
 	int opcode;
-	unsigned long ip; /* number of input operands and flags */
-}op_names[]={
+	unsigned long ip;	/* number of input operands and flags */
+} op_names[] = {
+	/* *INDENT-OFF* */
 	OPN(ABS, 1),
 	OPN(ADD, 2),
-	OPN(ARL, 1|SCALAR_FLAG),
+	OPN(ARL, 1 | SCALAR_FLAG),
 	OPN(DP3, 2),
 	OPN(DP4, 2),
 	OPN(DPH, 2),
 	OPN(DST, 2),
-	OPN(EX2, 1|SCALAR_FLAG),
-	OPN(EXP, 1|SCALAR_FLAG),
+	OPN(EX2, 1 | SCALAR_FLAG),
+	OPN(EXP, 1 | SCALAR_FLAG),
 	OPN(FLR, 1),
 	OPN(FRC, 1),
-	OPN(LG2, 1|SCALAR_FLAG),
+	OPN(LG2, 1 | SCALAR_FLAG),
 	OPN(LIT, 1),
-	OPN(LOG, 1|SCALAR_FLAG),
+	OPN(LOG, 1 | SCALAR_FLAG),
 	OPN(MAD, 3),
 	OPN(MAX, 2),
 	OPN(MIN, 2),
 	OPN(MOV, 1),
 	OPN(MUL, 2),
-	OPN(POW, 2|SCALAR_FLAG),
-	OPN(RCP, 1|SCALAR_FLAG),
-	OPN(RSQ, 1|SCALAR_FLAG),
+	OPN(POW, 2 | SCALAR_FLAG),
+	OPN(RCP, 1 | SCALAR_FLAG),
+	OPN(RSQ, 1 | SCALAR_FLAG),
 	OPN(SGE, 2),
 	OPN(SLT, 2),
 	OPN(SUB, 2),
 	OPN(SWZ, 1),
 	OPN(XPD, 2),
-	OPN(RCC, 0), //extra
+	OPN(RCC, 0),	//extra
 	OPN(PRINT, 0),
-	OPN(END, 0),
+	OPN(END, 0)
+	/* *INDENT-ON* */
 };
+
 #undef OPN
 
-int r300VertexProgUpdateParams(GLcontext *ctx, struct r300_vertex_program_cont *vp, float *dst)
+int r300VertexProgUpdateParams(GLcontext * ctx,
+			       struct r300_vertex_program_cont *vp, float *dst)
 {
 	int pi;
 	struct gl_vertex_program *mesa_vp = &vp->mesa_program;
-	float *dst_o=dst;
-        struct gl_program_parameter_list *paramList;
+	float *dst_o = dst;
+	struct gl_program_parameter_list *paramList;
 
 	if (mesa_vp->IsNVProgram) {
 		_mesa_load_tracked_matrices(ctx);
 
-		for (pi=0; pi < MAX_NV_VERTEX_PROGRAM_PARAMS; pi++) {
-			*dst++=ctx->VertexProgram.Parameters[pi][0];
-			*dst++=ctx->VertexProgram.Parameters[pi][1];
-			*dst++=ctx->VertexProgram.Parameters[pi][2];
-			*dst++=ctx->VertexProgram.Parameters[pi][3];
+		for (pi = 0; pi < MAX_NV_VERTEX_PROGRAM_PARAMS; pi++) {
+			*dst++ = ctx->VertexProgram.Parameters[pi][0];
+			*dst++ = ctx->VertexProgram.Parameters[pi][1];
+			*dst++ = ctx->VertexProgram.Parameters[pi][2];
+			*dst++ = ctx->VertexProgram.Parameters[pi][3];
 		}
 		return dst - dst_o;
 	}
@@ -119,26 +123,29 @@ int r300VertexProgUpdateParams(GLcontext *ctx, struct r300_vertex_program_cont *
 	assert(mesa_vp->Base.Parameters);
 	_mesa_load_state_parameters(ctx, mesa_vp->Base.Parameters);
 
-	if(mesa_vp->Base.Parameters->NumParameters * 4 > VSF_MAX_FRAGMENT_LENGTH){
+	if (mesa_vp->Base.Parameters->NumParameters * 4 >
+	    VSF_MAX_FRAGMENT_LENGTH) {
 		fprintf(stderr, "%s:Params exhausted\n", __FUNCTION__);
 		_mesa_exit(-1);
 	}
 
-        paramList = mesa_vp->Base.Parameters;
-	for(pi=0; pi < paramList->NumParameters; pi++){
-		switch(paramList->Parameters[pi].Type){
+	paramList = mesa_vp->Base.Parameters;
+	for (pi = 0; pi < paramList->NumParameters; pi++) {
+		switch (paramList->Parameters[pi].Type) {
 
 		case PROGRAM_STATE_VAR:
 		case PROGRAM_NAMED_PARAM:
 			//fprintf(stderr, "%s", vp->Parameters->Parameters[pi].Name);
 		case PROGRAM_CONSTANT:
-			*dst++=paramList->ParameterValues[pi][0];
-			*dst++=paramList->ParameterValues[pi][1];
-			*dst++=paramList->ParameterValues[pi][2];
-			*dst++=paramList->ParameterValues[pi][3];
-		break;
+			*dst++ = paramList->ParameterValues[pi][0];
+			*dst++ = paramList->ParameterValues[pi][1];
+			*dst++ = paramList->ParameterValues[pi][2];
+			*dst++ = paramList->ParameterValues[pi][3];
+			break;
 
-		default: _mesa_problem(NULL, "Bad param type in %s", __FUNCTION__);
+		default:
+			_mesa_problem(NULL, "Bad param type in %s",
+				      __FUNCTION__);
 		}
 
 	}
@@ -155,32 +162,33 @@ static unsigned long t_dst_mask(GLuint mask)
 static unsigned long t_dst_class(enum register_file file)
 {
 
-	switch(file){
-		case PROGRAM_TEMPORARY:
-			return VSF_OUT_CLASS_TMP;
-		case PROGRAM_OUTPUT:
-			return VSF_OUT_CLASS_RESULT;
-		case PROGRAM_ADDRESS:
-			return VSF_OUT_CLASS_ADDR;
+	switch (file) {
+	case PROGRAM_TEMPORARY:
+		return VSF_OUT_CLASS_TMP;
+	case PROGRAM_OUTPUT:
+		return VSF_OUT_CLASS_RESULT;
+	case PROGRAM_ADDRESS:
+		return VSF_OUT_CLASS_ADDR;
 		/*
-		case PROGRAM_INPUT:
-		case PROGRAM_LOCAL_PARAM:
-		case PROGRAM_ENV_PARAM:
-		case PROGRAM_NAMED_PARAM:
-		case PROGRAM_STATE_VAR:
-		case PROGRAM_WRITE_ONLY:
-		case PROGRAM_ADDRESS:
-		*/
-		default:
-			fprintf(stderr, "problem in %s", __FUNCTION__);
-			_mesa_exit(-1);
-			return -1;
+		   case PROGRAM_INPUT:
+		   case PROGRAM_LOCAL_PARAM:
+		   case PROGRAM_ENV_PARAM:
+		   case PROGRAM_NAMED_PARAM:
+		   case PROGRAM_STATE_VAR:
+		   case PROGRAM_WRITE_ONLY:
+		   case PROGRAM_ADDRESS:
+		 */
+	default:
+		fprintf(stderr, "problem in %s", __FUNCTION__);
+		_mesa_exit(-1);
+		return -1;
 	}
 }
 
-static unsigned long t_dst_index(struct r300_vertex_program *vp, struct prog_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 (dst->File == PROGRAM_OUTPUT)
 		return vp->outputs[dst->Index];
 
 	return dst->Index;
@@ -189,27 +197,27 @@ static unsigned long t_dst_index(struct r300_vertex_program *vp, struct prog_dst
 static unsigned long t_src_class(enum register_file file)
 {
 
-	switch(file){
-		case PROGRAM_TEMPORARY:
-			return VSF_IN_CLASS_TMP;
+	switch (file) {
+	case PROGRAM_TEMPORARY:
+		return VSF_IN_CLASS_TMP;
 
-		case PROGRAM_INPUT:
-			return VSF_IN_CLASS_ATTR;
+	case PROGRAM_INPUT:
+		return VSF_IN_CLASS_ATTR;
 
-		case PROGRAM_LOCAL_PARAM:
-		case PROGRAM_ENV_PARAM:
-		case PROGRAM_NAMED_PARAM:
-		case PROGRAM_STATE_VAR:
-			return VSF_IN_CLASS_PARAM;
+	case PROGRAM_LOCAL_PARAM:
+	case PROGRAM_ENV_PARAM:
+	case PROGRAM_NAMED_PARAM:
+	case PROGRAM_STATE_VAR:
+		return VSF_IN_CLASS_PARAM;
 		/*
-		case PROGRAM_OUTPUT:
-		case PROGRAM_WRITE_ONLY:
-		case PROGRAM_ADDRESS:
-		*/
-		default:
-			fprintf(stderr, "problem in %s", __FUNCTION__);
-			_mesa_exit(-1);
-			return -1;
+		   case PROGRAM_OUTPUT:
+		   case PROGRAM_WRITE_ONLY:
+		   case PROGRAM_ADDRESS:
+		 */
+	default:
+		fprintf(stderr, "problem in %s", __FUNCTION__);
+		_mesa_exit(-1);
+		return -1;
 	}
 }
 
@@ -224,94 +232,104 @@ static void vp_dump_inputs(struct r300_vertex_program *vp, char *caller)
 {
 	int i;
 
-	if(vp == NULL){
-		fprintf(stderr, "vp null in call to %s from %s\n", __FUNCTION__, caller);
-		return ;
+	if (vp == NULL) {
+		fprintf(stderr, "vp null in call to %s from %s\n", __FUNCTION__,
+			caller);
+		return;
 	}
 
 	fprintf(stderr, "%s:<", caller);
-	for(i=0; i < VERT_ATTRIB_MAX; i++)
+	for (i = 0; i < VERT_ATTRIB_MAX; i++)
 		fprintf(stderr, "%d ", vp->inputs[i]);
 	fprintf(stderr, ">\n");
 
 }
 #endif
 
-static unsigned long t_src_index(struct r300_vertex_program *vp, struct prog_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;
+	int max_reg = -1;
 
-	if(src->File == PROGRAM_INPUT){
-		if(vp->inputs[src->Index] != -1)
+	if (src->File == PROGRAM_INPUT) {
+		if (vp->inputs[src->Index] != -1)
 			return vp->inputs[src->Index];
 
-		for(i=0; i < VERT_ATTRIB_MAX; i++)
-			if(vp->inputs[i] > max_reg)
-				max_reg=vp->inputs[i];
+		for (i = 0; i < VERT_ATTRIB_MAX; i++)
+			if (vp->inputs[i] > max_reg)
+				max_reg = vp->inputs[i];
 
-		vp->inputs[src->Index]=max_reg+1;
+		vp->inputs[src->Index] = max_reg + 1;
 
 		//vp_dump_inputs(vp, __FUNCTION__);
 
 		return vp->inputs[src->Index];
-	}else{
+	} else {
 		if (src->Index < 0) {
-			fprintf (stderr, "negative offsets for indirect addressing do not work.\n");
+			fprintf(stderr,
+				"negative offsets for indirect addressing do not work.\n");
 			return 0;
 		}
 		return src->Index;
 	}
 }
 
-static unsigned long t_src(struct r300_vertex_program *vp, struct prog_src_register *src)
+static unsigned long t_src(struct r300_vertex_program *vp,
+			   struct prog_src_register *src)
 {
 	/* src->NegateBase uses the NEGATE_ flags from program_instruction.h,
 	 * which equal our VSF_FLAGS_ values, so it's safe to just pass it here.
 	 */
 	return MAKE_VSF_SOURCE(t_src_index(vp, src),
-				t_swizzle(GET_SWZ(src->Swizzle, 0)),
-				t_swizzle(GET_SWZ(src->Swizzle, 1)),
-				t_swizzle(GET_SWZ(src->Swizzle, 2)),
-				t_swizzle(GET_SWZ(src->Swizzle, 3)),
-				t_src_class(src->File),
-				src->NegateBase) | (src->RelAddr << 4);
+			       t_swizzle(GET_SWZ(src->Swizzle, 0)),
+			       t_swizzle(GET_SWZ(src->Swizzle, 1)),
+			       t_swizzle(GET_SWZ(src->Swizzle, 2)),
+			       t_swizzle(GET_SWZ(src->Swizzle, 3)),
+			       t_src_class(src->File),
+			       src->NegateBase) | (src->RelAddr << 4);
 }
 
-static unsigned long t_src_scalar(struct r300_vertex_program *vp, struct prog_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),
-				t_swizzle(GET_SWZ(src->Swizzle, 0)),
-				t_swizzle(GET_SWZ(src->Swizzle, 0)),
-				t_swizzle(GET_SWZ(src->Swizzle, 0)),
-				t_swizzle(GET_SWZ(src->Swizzle, 0)),
-				t_src_class(src->File),
-				src->NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src->RelAddr << 4);
+			       t_swizzle(GET_SWZ(src->Swizzle, 0)),
+			       t_swizzle(GET_SWZ(src->Swizzle, 0)),
+			       t_swizzle(GET_SWZ(src->Swizzle, 0)),
+			       t_swizzle(GET_SWZ(src->Swizzle, 0)),
+			       t_src_class(src->File),
+			       src->
+			       NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
+	    (src->RelAddr << 4);
 }
 
 static unsigned long t_opcode(enum prog_opcode opcode)
 {
 
-	switch(opcode){
-		case OPCODE_ARL: return R300_VPI_OUT_OP_ARL;
-		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_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);
+	switch (opcode) {
+	/* *INDENT-OFF* */
+	case OPCODE_ARL: return R300_VPI_OUT_OP_ARL;
+	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_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;
+	/* *INDENT-ON* */
+
+	default:
+		fprintf(stderr, "%s: Should not be called with opcode %d!",
+			__FUNCTION__, opcode);
 	}
 	_mesa_exit(-1);
 	return 0;
@@ -322,8 +340,8 @@ static unsigned long op_operands(enum prog_opcode opcode)
 	int i;
 
 	/* Can we trust mesas opcodes to be in order ? */
-	for(i=0; i < sizeof(op_names) / sizeof(*op_names); i++)
-		if(op_names[i].opcode == opcode)
+	for (i = 0; i < sizeof(op_names) / sizeof(*op_names); i++)
+		if (op_names[i].opcode == opcode)
 			return op_names[i].ip;
 
 	fprintf(stderr, "op %d not found in op_names\n", opcode);
@@ -331,11 +349,12 @@ static unsigned long op_operands(enum prog_opcode opcode)
 	return 0;
 }
 
-static GLboolean valid_dst(struct r300_vertex_program *vp, struct prog_dst_register *dst)
+static GLboolean valid_dst(struct r300_vertex_program *vp,
+			   struct prog_dst_register *dst)
 {
-	if(dst->File == PROGRAM_OUTPUT && vp->outputs[dst->Index] == -1) {
+	if (dst->File == PROGRAM_OUTPUT && vp->outputs[dst->Index] == -1) {
 		return GL_FALSE;
-	} else if(dst->File == PROGRAM_ADDRESS) {
+	} else if (dst->File == PROGRAM_ADDRESS) {
 		assert(dst->Index == 0);
 	}
 
@@ -391,9 +410,10 @@ static GLboolean valid_dst(struct r300_vertex_program *vp, struct prog_dst_regis
 		u_temp_i=VSF_MAX_FRAGMENT_TEMPS-1; \
 	} while (0)
 
-static void r300_translate_vertex_shader(struct r300_vertex_program *vp, struct prog_instruction *vpi)
+static void r300_translate_vertex_shader(struct r300_vertex_program *vp,
+					 struct prog_instruction *vpi)
 {
-	int i, cur_reg=0;
+	int i, cur_reg = 0;
 	VERTEX_SHADER_INSTRUCTION *o_inst;
 	unsigned long operands;
 	int are_srcs_scalar;
@@ -401,341 +421,475 @@ static void r300_translate_vertex_shader(struct r300_vertex_program *vp, struct
 	/* Initial value should be last tmp reg that hw supports.
 	   Strangely enough r300 doesnt mind even though these would be out of range.
 	   Smart enough to realize that it doesnt need it? */
-	int u_temp_i=VSF_MAX_FRAGMENT_TEMPS-1;
+	int u_temp_i = VSF_MAX_FRAGMENT_TEMPS - 1;
 	struct prog_src_register src[3];
 
-	vp->pos_end=0; /* Not supported yet */
-	vp->program.length=0;
-	/*vp->num_temporaries=mesa_vp->Base.NumTemporaries;*/
+	vp->pos_end = 0;	/* Not supported yet */
+	vp->program.length = 0;
+	/*vp->num_temporaries=mesa_vp->Base.NumTemporaries; */
 
-	for(i=0; i < VERT_ATTRIB_MAX; i++)
+	for (i = 0; i < VERT_ATTRIB_MAX; i++)
 		vp->inputs[i] = -1;
 
-	for(i=0; i < VERT_RESULT_MAX; i++)
+	for (i = 0; i < VERT_RESULT_MAX; i++)
 		vp->outputs[i] = -1;
 
 	assert(vp->key.OutputsWritten & (1 << VERT_RESULT_HPOS));
 
 	/* Assign outputs */
-	if(vp->key.OutputsWritten & (1 << VERT_RESULT_HPOS))
+	if (vp->key.OutputsWritten & (1 << VERT_RESULT_HPOS))
 		vp->outputs[VERT_RESULT_HPOS] = cur_reg++;
 
-	if(vp->key.OutputsWritten & (1 << VERT_RESULT_PSIZ))
+	if (vp->key.OutputsWritten & (1 << VERT_RESULT_PSIZ))
 		vp->outputs[VERT_RESULT_PSIZ] = cur_reg++;
 
-	if(vp->key.OutputsWritten & (1 << VERT_RESULT_COL0))
+	if (vp->key.OutputsWritten & (1 << VERT_RESULT_COL0))
 		vp->outputs[VERT_RESULT_COL0] = cur_reg++;
 
-	if(vp->key.OutputsWritten & (1 << VERT_RESULT_COL1))
+	if (vp->key.OutputsWritten & (1 << VERT_RESULT_COL1))
 		vp->outputs[VERT_RESULT_COL1] = cur_reg++;
 
-#if 0 /* Not supported yet */
-	if(vp->key.OutputsWritten & (1 << VERT_RESULT_BFC0))
+#if 0				/* Not supported yet */
+	if (vp->key.OutputsWritten & (1 << VERT_RESULT_BFC0))
 		vp->outputs[VERT_RESULT_BFC0] = cur_reg++;
 
-	if(vp->key.OutputsWritten & (1 << VERT_RESULT_BFC1))
+	if (vp->key.OutputsWritten & (1 << VERT_RESULT_BFC1))
 		vp->outputs[VERT_RESULT_BFC1] = cur_reg++;
 
-	if(vp->key.OutputsWritten & (1 << VERT_RESULT_FOGC))
+	if (vp->key.OutputsWritten & (1 << VERT_RESULT_FOGC))
 		vp->outputs[VERT_RESULT_FOGC] = cur_reg++;
 #endif
 
-	for(i=VERT_RESULT_TEX0; i <= VERT_RESULT_TEX7; i++)
-		if(vp->key.OutputsWritten & (1 << i))
+	for (i = VERT_RESULT_TEX0; i <= VERT_RESULT_TEX7; i++)
+		if (vp->key.OutputsWritten & (1 << i))
 			vp->outputs[i] = cur_reg++;
 
 	vp->translated = GL_TRUE;
 	vp->native = GL_TRUE;
 
-	o_inst=vp->program.body.i;
-	for(; vpi->Opcode != OPCODE_END; vpi++, o_inst++){
+	o_inst = vp->program.body.i;
+	for (; vpi->Opcode != OPCODE_END; vpi++, o_inst++) {
 		FREE_TEMPS();
 
-		if(!valid_dst(vp, &vpi->DstReg))
-		{
+		if (!valid_dst(vp, &vpi->DstReg)) {
 			/* redirect result to unused temp */
 			vpi->DstReg.File = PROGRAM_TEMPORARY;
 			vpi->DstReg.Index = u_temp_i;
 		}
 
-		operands=op_operands(vpi->Opcode);
-		are_srcs_scalar=operands & SCALAR_FLAG;
+		operands = op_operands(vpi->Opcode);
+		are_srcs_scalar = operands & SCALAR_FLAG;
 		operands &= OP_MASK;
 
-		for(i=0; i < operands; i++)
-			src[i]=vpi->SrcReg[i];
-
-		if(operands == 3){ /* TODO: scalars */
-			if( CMP_SRCS(src[1], src[2]) || CMP_SRCS(src[0], src[2]) ){
-				o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_ADD, u_temp_i,
-						VSF_FLAG_ALL, VSF_OUT_CLASS_TMP);
-
-				o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[2]),
-						SWIZZLE_X, SWIZZLE_Y,
-						SWIZZLE_Z, SWIZZLE_W,
-						t_src_class(src[2].File), VSF_FLAG_NONE) | (src[2].RelAddr << 4);
-
-				o_inst->src[1]=ZERO_SRC_2;
-				o_inst->src[2]=ZERO_SRC_2;
+		for (i = 0; i < operands; i++)
+			src[i] = vpi->SrcReg[i];
+
+		if (operands == 3) {	/* TODO: scalars */
+			if (CMP_SRCS(src[1], src[2])
+			    || CMP_SRCS(src[0], src[2])) {
+				o_inst->op =
+				    MAKE_VSF_OP(R300_VPI_OUT_OP_ADD, u_temp_i,
+						VSF_FLAG_ALL,
+						VSF_OUT_CLASS_TMP);
+
+				o_inst->src[0] =
+				    MAKE_VSF_SOURCE(t_src_index(vp, &src[2]),
+						    SWIZZLE_X, SWIZZLE_Y,
+						    SWIZZLE_Z, SWIZZLE_W,
+						    t_src_class(src[2].File),
+						    VSF_FLAG_NONE) | (src[2].
+								      RelAddr <<
+								      4);
+
+				o_inst->src[1] = ZERO_SRC_2;
+				o_inst->src[2] = ZERO_SRC_2;
 				o_inst++;
 
-				src[2].File=PROGRAM_TEMPORARY;
-				src[2].Index=u_temp_i;
-				src[2].RelAddr=0;
+				src[2].File = PROGRAM_TEMPORARY;
+				src[2].Index = u_temp_i;
+				src[2].RelAddr = 0;
 				u_temp_i--;
 			}
 
 		}
 
-		if(operands >= 2){
-			if( CMP_SRCS(src[1], src[0]) ){
-				o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_ADD, u_temp_i,
-						VSF_FLAG_ALL, VSF_OUT_CLASS_TMP);
-
-				o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-						SWIZZLE_X, SWIZZLE_Y,
-						SWIZZLE_Z, SWIZZLE_W,
-						t_src_class(src[0].File), VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-
-				o_inst->src[1]=ZERO_SRC_0;
-				o_inst->src[2]=ZERO_SRC_0;
+		if (operands >= 2) {
+			if (CMP_SRCS(src[1], src[0])) {
+				o_inst->op =
+				    MAKE_VSF_OP(R300_VPI_OUT_OP_ADD, u_temp_i,
+						VSF_FLAG_ALL,
+						VSF_OUT_CLASS_TMP);
+
+				o_inst->src[0] =
+				    MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
+						    SWIZZLE_X, SWIZZLE_Y,
+						    SWIZZLE_Z, SWIZZLE_W,
+						    t_src_class(src[0].File),
+						    VSF_FLAG_NONE) | (src[0].
+								      RelAddr <<
+								      4);
+
+				o_inst->src[1] = ZERO_SRC_0;
+				o_inst->src[2] = ZERO_SRC_0;
 				o_inst++;
 
-				src[0].File=PROGRAM_TEMPORARY;
-				src[0].Index=u_temp_i;
-				src[0].RelAddr=0;
+				src[0].File = PROGRAM_TEMPORARY;
+				src[0].Index = u_temp_i;
+				src[0].RelAddr = 0;
 				u_temp_i--;
 			}
 		}
 
 		/* These ops need special handling. */
-		switch(vpi->Opcode){
+		switch (vpi->Opcode) {
 		case OPCODE_POW:
-			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_POW, t_dst_index(vp, &vpi->DstReg),
-					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-			o_inst->src[0]=t_src_scalar(vp, &src[0]);
-			o_inst->src[1]=ZERO_SRC_0;
-			o_inst->src[2]=t_src_scalar(vp, &src[1]);
+			o_inst->op =
+			    MAKE_VSF_OP(R300_VPI_OUT_OP_POW,
+					t_dst_index(vp, &vpi->DstReg),
+					t_dst_mask(vpi->DstReg.WriteMask),
+					t_dst_class(vpi->DstReg.File));
+			o_inst->src[0] = t_src_scalar(vp, &src[0]);
+			o_inst->src[1] = ZERO_SRC_0;
+			o_inst->src[2] = t_src_scalar(vp, &src[1]);
 			goto next;
 
-		case 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}
 		case OPCODE_SWZ:
 #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));
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=ZERO_SRC_0;
-			o_inst->src[2]=ZERO_SRC_0;
+			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));
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = ZERO_SRC_0;
+			o_inst->src[2] = ZERO_SRC_0;
 #else
-			hw_op=(src[0].File == PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 : R300_VPI_OUT_OP_MAD;
-
-			o_inst->op=MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
-				t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=ONE_SRC_0;
-			o_inst->src[2]=ZERO_SRC_0;
+			hw_op =
+			    (src[0].File ==
+			     PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 :
+			    R300_VPI_OUT_OP_MAD;
+
+			o_inst->op =
+			    MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
+					t_dst_mask(vpi->DstReg.WriteMask),
+					t_dst_class(vpi->DstReg.File));
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = ONE_SRC_0;
+			o_inst->src[2] = ZERO_SRC_0;
 #endif
 
 			goto next;
 
 		case OPCODE_ADD:
 #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;
-
-			o_inst->op=MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
-				t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-			o_inst->src[0]=ONE_SRC_0;
-			o_inst->src[1]=t_src(vp, &src[0]);
-			o_inst->src[2]=t_src(vp, &src[1]);
+			hw_op = (src[0].File == PROGRAM_TEMPORARY &&
+				 src[1].File ==
+				 PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 :
+			    R300_VPI_OUT_OP_MAD;
+
+			o_inst->op =
+			    MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
+					t_dst_mask(vpi->DstReg.WriteMask),
+					t_dst_class(vpi->DstReg.File));
+			o_inst->src[0] = ONE_SRC_0;
+			o_inst->src[1] = t_src(vp, &src[0]);
+			o_inst->src[2] = t_src(vp, &src[1]);
 #else
-			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));
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=t_src(vp, &src[1]);
-			o_inst->src[2]=ZERO_SRC_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));
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = t_src(vp, &src[1]);
+			o_inst->src[2] = ZERO_SRC_1;
 
 #endif
 			goto next;
 
 		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;
-
-			o_inst->op=MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
-				t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=t_src(vp, &src[1]);
-			o_inst->src[2]=t_src(vp, &src[2]);
+			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;
+
+			o_inst->op =
+			    MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
+					t_dst_mask(vpi->DstReg.WriteMask),
+					t_dst_class(vpi->DstReg.File));
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = t_src(vp, &src[1]);
+			o_inst->src[2] = t_src(vp, &src[2]);
 			goto next;
 
-		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;
+		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;
 
-			o_inst->op=MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
-				t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=t_src(vp, &src[1]);
+			o_inst->op =
+			    MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
+					t_dst_mask(vpi->DstReg.WriteMask),
+					t_dst_class(vpi->DstReg.File));
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = t_src(vp, &src[1]);
 
-			o_inst->src[2]=ZERO_SRC_1;
+			o_inst->src[2] = ZERO_SRC_1;
 			goto next;
 
-		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));
-
-			o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
-					SWIZZLE_ZERO,
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_XYZ : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-
-			o_inst->src[1]=MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 1)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 2)),
-					SWIZZLE_ZERO,
-					t_src_class(src[1].File),
-					src[1].NegateBase ? VSF_FLAG_XYZ : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
-
-			o_inst->src[2]=ZERO_SRC_1;
+		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));
+
+			o_inst->src[0] =
+			    MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 1)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 2)),
+					    SWIZZLE_ZERO,
+					    t_src_class(src[0].File),
+					    src[0].
+					    NegateBase ? VSF_FLAG_XYZ :
+					    VSF_FLAG_NONE) | (src[0].
+							      RelAddr << 4);
+
+			o_inst->src[1] =
+			    MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 1)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 2)),
+					    SWIZZLE_ZERO,
+					    t_src_class(src[1].File),
+					    src[1].
+					    NegateBase ? VSF_FLAG_XYZ :
+					    VSF_FLAG_NONE) | (src[1].
+							      RelAddr << 4);
+
+			o_inst->src[2] = ZERO_SRC_1;
 			goto next;
 
-		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
+		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;
-
-			o_inst->op=MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
-				t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=ONE_SRC_0;
-			o_inst->src[2]=MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 1)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 2)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 3)),
-					t_src_class(src[1].File),
-					(!src[1].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE)  | (src[1].RelAddr << 4);
+			hw_op = (src[0].File == PROGRAM_TEMPORARY &&
+				 src[1].File ==
+				 PROGRAM_TEMPORARY) ? R300_VPI_OUT_OP_MAD_2 :
+			    R300_VPI_OUT_OP_MAD;
+
+			o_inst->op =
+			    MAKE_VSF_OP(hw_op, t_dst_index(vp, &vpi->DstReg),
+					t_dst_mask(vpi->DstReg.WriteMask),
+					t_dst_class(vpi->DstReg.File));
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = ONE_SRC_0;
+			o_inst->src[2] =
+			    MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 1)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 2)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 3)),
+					    t_src_class(src[1].File),
+					    (!src[1].
+					     NegateBase) ? VSF_FLAG_ALL :
+					    VSF_FLAG_NONE) | (src[1].
+							      RelAddr << 4);
 #else
-			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));
-
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 1)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 2)),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 3)),
-					t_src_class(src[1].File),
-					(!src[1].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
-			o_inst->src[2]=0;
+			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));
+
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] =
+			    MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 1)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 2)),
+					    t_swizzle(GET_SWZ
+						      (src[1].Swizzle, 3)),
+					    t_src_class(src[1].File),
+					    (!src[1].
+					     NegateBase) ? VSF_FLAG_ALL :
+					    VSF_FLAG_NONE) | (src[1].
+							      RelAddr << 4);
+			o_inst->src[2] = 0;
 #endif
 			goto next;
 
-		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));
-
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 3)),
-					t_src_class(src[0].File),
-					(!src[0].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-			o_inst->src[2]=0;
+		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));
+
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] =
+			    MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 1)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 2)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 3)),
+					    t_src_class(src[0].File),
+					    (!src[0].
+					     NegateBase) ? VSF_FLAG_ALL :
+					    VSF_FLAG_NONE) | (src[0].
+							      RelAddr << 4);
+			o_inst->src[2] = 0;
 			goto next;
 
 		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 */
+			/* 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 */
 
-			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_FRC, u_temp_i,
-					t_dst_mask(vpi->DstReg.WriteMask), VSF_OUT_CLASS_TMP);
+			o_inst->op = MAKE_VSF_OP(R300_VPI_OUT_OP_FRC, u_temp_i,
+						 t_dst_mask(vpi->DstReg.
+							    WriteMask),
+						 VSF_OUT_CLASS_TMP);
 
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=ZERO_SRC_0;
-			o_inst->src[2]=ZERO_SRC_0;
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = ZERO_SRC_0;
+			o_inst->src[2] = ZERO_SRC_0;
 			o_inst++;
 
-			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));
-
-			o_inst->src[0]=t_src(vp, &src[0]);
-			o_inst->src[1]=MAKE_VSF_SOURCE(u_temp_i,
-					VSF_IN_COMPONENT_X,
-					VSF_IN_COMPONENT_Y,
-					VSF_IN_COMPONENT_Z,
-					VSF_IN_COMPONENT_W,
-					VSF_IN_CLASS_TMP,
-					/* Not 100% sure about this */
-					(!src[0].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE/*VSF_FLAG_ALL*/);
-
-			o_inst->src[2]=ZERO_SRC_0;
+			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));
+
+			o_inst->src[0] = t_src(vp, &src[0]);
+			o_inst->src[1] = MAKE_VSF_SOURCE(u_temp_i,
+							 VSF_IN_COMPONENT_X,
+							 VSF_IN_COMPONENT_Y,
+							 VSF_IN_COMPONENT_Z,
+							 VSF_IN_COMPONENT_W,
+							 VSF_IN_CLASS_TMP,
+							 /* Not 100% sure about this */
+							 (!src[0].
+							  NegateBase) ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE
+							 /*VSF_FLAG_ALL */ );
+
+			o_inst->src[2] = ZERO_SRC_0;
 			u_temp_i--;
 			goto next;
 
-		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));
-
-			o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-			o_inst->src[1]=ZERO_SRC_0;
-			o_inst->src[2]=ZERO_SRC_0;
+		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));
+
+			o_inst->src[0] =
+			    MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 0)),
+					    t_src_class(src[0].File),
+					    src[0].
+					    NegateBase ? VSF_FLAG_ALL :
+					    VSF_FLAG_NONE) | (src[0].
+							      RelAddr << 4);
+			o_inst->src[1] = ZERO_SRC_0;
+			o_inst->src[2] = ZERO_SRC_0;
 			goto next;
 
-		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));
+		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. */
-			o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)), // x
-					t_swizzle(GET_SWZ(src[0].Swizzle, 3)), // w
-					VSF_IN_COMPONENT_ZERO, // z
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)), // y
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-			o_inst->src[1]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)), // y
-					t_swizzle(GET_SWZ(src[0].Swizzle, 3)), // w
-					VSF_IN_COMPONENT_ZERO, // z
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)), // x
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-			o_inst->src[2]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)), // y
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)), // x
-					VSF_IN_COMPONENT_ZERO, // z
-					t_swizzle(GET_SWZ(src[0].Swizzle, 3)), // w
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
+			o_inst->src[0] = MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// x
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// w
+							 VSF_IN_COMPONENT_ZERO,	// z
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// y
+							 t_src_class(src[0].
+								     File),
+							 src[0].
+							 NegateBase ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE) |
+			    (src[0].RelAddr << 4);
+			o_inst->src[1] = MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// y
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// w
+							 VSF_IN_COMPONENT_ZERO,	// z
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// x
+							 t_src_class(src[0].
+								     File),
+							 src[0].
+							 NegateBase ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE) |
+			    (src[0].RelAddr << 4);
+			o_inst->src[2] = MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// y
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// x
+							 VSF_IN_COMPONENT_ZERO,	// z
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// w
+							 t_src_class(src[0].
+								     File),
+							 src[0].
+							 NegateBase ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE) |
+			    (src[0].RelAddr << 4);
 			goto next;
 
-		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));
-
-			o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 2)),
-					VSF_IN_COMPONENT_ONE,
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_XYZ : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-			o_inst->src[1]=t_src(vp, &src[1]);
-			o_inst->src[2]=ZERO_SRC_1;
+		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));
+
+			o_inst->src[0] =
+			    MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 0)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 1)),
+					    t_swizzle(GET_SWZ
+						      (src[0].Swizzle, 2)),
+					    VSF_IN_COMPONENT_ONE,
+					    t_src_class(src[0].File),
+					    src[0].
+					    NegateBase ? VSF_FLAG_XYZ :
+					    VSF_FLAG_NONE) | (src[0].
+							      RelAddr << 4);
+			o_inst->src[1] = t_src(vp, &src[1]);
+			o_inst->src[2] = ZERO_SRC_1;
 			goto next;
 
 		case OPCODE_XPD:
@@ -744,135 +898,162 @@ static void r300_translate_vertex_shader(struct r300_vertex_program *vp, struct
 			   NOTE: might need MAD_2
 			 */
 
-			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_MAD, u_temp_i,
-					t_dst_mask(vpi->DstReg.WriteMask), VSF_OUT_CLASS_TMP);
-
-			o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)), // y
-					t_swizzle(GET_SWZ(src[0].Swizzle, 2)), // z
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)), // x
-					t_swizzle(GET_SWZ(src[0].Swizzle, 3)), // w
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-
-			o_inst->src[1]=MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 2)), // z
-					t_swizzle(GET_SWZ(src[1].Swizzle, 0)), // x
-					t_swizzle(GET_SWZ(src[1].Swizzle, 1)), // y
-					t_swizzle(GET_SWZ(src[1].Swizzle, 3)), // w
-					t_src_class(src[1].File),
-					src[1].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
-
-			o_inst->src[2]=ZERO_SRC_1;
+			o_inst->op = MAKE_VSF_OP(R300_VPI_OUT_OP_MAD, u_temp_i,
+						 t_dst_mask(vpi->DstReg.
+							    WriteMask),
+						 VSF_OUT_CLASS_TMP);
+
+			o_inst->src[0] = MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// y
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 2)),	// z
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// x
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// w
+							 t_src_class(src[0].
+								     File),
+							 src[0].
+							 NegateBase ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE) |
+			    (src[0].RelAddr << 4);
+
+			o_inst->src[1] = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]), t_swizzle(GET_SWZ(src[1].Swizzle, 2)),	// z
+							 t_swizzle(GET_SWZ(src[1].Swizzle, 0)),	// x
+							 t_swizzle(GET_SWZ(src[1].Swizzle, 1)),	// y
+							 t_swizzle(GET_SWZ(src[1].Swizzle, 3)),	// w
+							 t_src_class(src[1].
+								     File),
+							 src[1].
+							 NegateBase ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE) |
+			    (src[1].RelAddr << 4);
+
+			o_inst->src[2] = ZERO_SRC_1;
 			o_inst++;
 			u_temp_i--;
 
-			o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_MAD, t_dst_index(vp, &vpi->DstReg),
-					t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-
-			o_inst->src[0]=MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
-					t_swizzle(GET_SWZ(src[1].Swizzle, 1)), // y
-					t_swizzle(GET_SWZ(src[1].Swizzle, 2)), // z
-					t_swizzle(GET_SWZ(src[1].Swizzle, 0)), // x
-					t_swizzle(GET_SWZ(src[1].Swizzle, 3)), // w
-					t_src_class(src[1].File),
-					(!src[1].NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[1].RelAddr << 4);
-
-			o_inst->src[1]=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]),
-					t_swizzle(GET_SWZ(src[0].Swizzle, 2)), // z
-					t_swizzle(GET_SWZ(src[0].Swizzle, 0)), // x
-					t_swizzle(GET_SWZ(src[0].Swizzle, 1)), // y
-					t_swizzle(GET_SWZ(src[0].Swizzle, 3)), // w
-					t_src_class(src[0].File),
-					src[0].NegateBase ? VSF_FLAG_ALL : VSF_FLAG_NONE) | (src[0].RelAddr << 4);
-
-			o_inst->src[2]=MAKE_VSF_SOURCE(u_temp_i+1,
-					VSF_IN_COMPONENT_X,
-					VSF_IN_COMPONENT_Y,
-					VSF_IN_COMPONENT_Z,
-					VSF_IN_COMPONENT_W,
-					VSF_IN_CLASS_TMP,
-					VSF_FLAG_NONE);
+			o_inst->op =
+			    MAKE_VSF_OP(R300_VPI_OUT_OP_MAD,
+					t_dst_index(vp, &vpi->DstReg),
+					t_dst_mask(vpi->DstReg.WriteMask),
+					t_dst_class(vpi->DstReg.File));
+
+			o_inst->src[0] = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]), t_swizzle(GET_SWZ(src[1].Swizzle, 1)),	// y
+							 t_swizzle(GET_SWZ(src[1].Swizzle, 2)),	// z
+							 t_swizzle(GET_SWZ(src[1].Swizzle, 0)),	// x
+							 t_swizzle(GET_SWZ(src[1].Swizzle, 3)),	// w
+							 t_src_class(src[1].
+								     File),
+							 (!src[1].
+							  NegateBase) ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE) |
+			    (src[1].RelAddr << 4);
+
+			o_inst->src[1] = MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 2)),	// z
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 0)),	// x
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 1)),	// y
+							 t_swizzle(GET_SWZ(src[0].Swizzle, 3)),	// w
+							 t_src_class(src[0].
+								     File),
+							 src[0].
+							 NegateBase ?
+							 VSF_FLAG_ALL :
+							 VSF_FLAG_NONE) |
+			    (src[0].RelAddr << 4);
+
+			o_inst->src[2] = MAKE_VSF_SOURCE(u_temp_i + 1,
+							 VSF_IN_COMPONENT_X,
+							 VSF_IN_COMPONENT_Y,
+							 VSF_IN_COMPONENT_Z,
+							 VSF_IN_COMPONENT_W,
+							 VSF_IN_CLASS_TMP,
+							 VSF_FLAG_NONE);
 
 			goto next;
 
 		case OPCODE_RCC:
-			fprintf(stderr, "Dont know how to handle op %d yet\n", vpi->Opcode);
+			fprintf(stderr, "Dont know how to handle op %d yet\n",
+				vpi->Opcode);
 			_mesa_exit(-1);
-		break;
+			break;
 		case OPCODE_END:
 			break;
 		default:
 			break;
 		}
 
-		o_inst->op=MAKE_VSF_OP(t_opcode(vpi->Opcode), t_dst_index(vp, &vpi->DstReg),
-				t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File));
-
-		if(are_srcs_scalar){
-			switch(operands){
-				case 1:
-					o_inst->src[0]=t_src_scalar(vp, &src[0]);
-					o_inst->src[1]=ZERO_SRC_0;
-					o_inst->src[2]=ZERO_SRC_0;
+		o_inst->op =
+		    MAKE_VSF_OP(t_opcode(vpi->Opcode),
+				t_dst_index(vp, &vpi->DstReg),
+				t_dst_mask(vpi->DstReg.WriteMask),
+				t_dst_class(vpi->DstReg.File));
+
+		if (are_srcs_scalar) {
+			switch (operands) {
+			case 1:
+				o_inst->src[0] = t_src_scalar(vp, &src[0]);
+				o_inst->src[1] = ZERO_SRC_0;
+				o_inst->src[2] = ZERO_SRC_0;
 				break;
 
-				case 2:
-					o_inst->src[0]=t_src_scalar(vp, &src[0]);
-					o_inst->src[1]=t_src_scalar(vp, &src[1]);
-					o_inst->src[2]=ZERO_SRC_1;
+			case 2:
+				o_inst->src[0] = t_src_scalar(vp, &src[0]);
+				o_inst->src[1] = t_src_scalar(vp, &src[1]);
+				o_inst->src[2] = ZERO_SRC_1;
 				break;
 
-				case 3:
-					o_inst->src[0]=t_src_scalar(vp, &src[0]);
-					o_inst->src[1]=t_src_scalar(vp, &src[1]);
-					o_inst->src[2]=t_src_scalar(vp, &src[2]);
+			case 3:
+				o_inst->src[0] = t_src_scalar(vp, &src[0]);
+				o_inst->src[1] = t_src_scalar(vp, &src[1]);
+				o_inst->src[2] = t_src_scalar(vp, &src[2]);
 				break;
 
-				default:
-					fprintf(stderr, "scalars and op RCC not handled yet");
-					_mesa_exit(-1);
+			default:
+				fprintf(stderr,
+					"scalars and op RCC not handled yet");
+				_mesa_exit(-1);
 				break;
 			}
-		}else{
-			switch(operands){
-				case 1:
-					o_inst->src[0]=t_src(vp, &src[0]);
-					o_inst->src[1]=ZERO_SRC_0;
-					o_inst->src[2]=ZERO_SRC_0;
+		} else {
+			switch (operands) {
+			case 1:
+				o_inst->src[0] = t_src(vp, &src[0]);
+				o_inst->src[1] = ZERO_SRC_0;
+				o_inst->src[2] = ZERO_SRC_0;
 				break;
 
-				case 2:
-					o_inst->src[0]=t_src(vp, &src[0]);
-					o_inst->src[1]=t_src(vp, &src[1]);
-					o_inst->src[2]=ZERO_SRC_1;
+			case 2:
+				o_inst->src[0] = t_src(vp, &src[0]);
+				o_inst->src[1] = t_src(vp, &src[1]);
+				o_inst->src[2] = ZERO_SRC_1;
 				break;
 
-				case 3:
-					o_inst->src[0]=t_src(vp, &src[0]);
-					o_inst->src[1]=t_src(vp, &src[1]);
-					o_inst->src[2]=t_src(vp, &src[2]);
+			case 3:
+				o_inst->src[0] = t_src(vp, &src[0]);
+				o_inst->src[1] = t_src(vp, &src[1]);
+				o_inst->src[2] = t_src(vp, &src[2]);
 				break;
 
-				default:
-					fprintf(stderr, "scalars and op RCC not handled yet");
-					_mesa_exit(-1);
+			default:
+				fprintf(stderr,
+					"scalars and op RCC not handled yet");
+				_mesa_exit(-1);
 				break;
 			}
 		}
-		next: ;
+	      next:;
 	}
 
 	/* Will most likely segfault before we get here... fix later. */
-	if(o_inst - vp->program.body.i >= VSF_MAX_FRAGMENT_LENGTH/4) {
+	if (o_inst - vp->program.body.i >= VSF_MAX_FRAGMENT_LENGTH / 4) {
 		vp->program.length = 0;
 		vp->native = GL_FALSE;
-		return ;
+		return;
 	}
-	vp->program.length=(o_inst - vp->program.body.i) * 4;
+	vp->program.length = (o_inst - vp->program.body.i) * 4;
 #if 0
 	fprintf(stderr, "hw program:\n");
-	for(i=0; i < vp->program.length; i++)
+	for (i = 0; i < vp->program.length; i++)
 		fprintf(stderr, "%08x\n", vp->program.body.d[i]);
 #endif
 }
@@ -885,20 +1066,20 @@ static void position_invariant(struct gl_program *prog)
 
 	gl_state_index tokens[STATE_LENGTH] = { STATE_MVP_MATRIX, 0, 0, 0, 0 };
 
-        /* tokens[4] = matrix modifier */
+	/* tokens[4] = matrix modifier */
 #ifdef PREFER_DP4
-	tokens[4] = 0;  /* not transposed or inverted */
+	tokens[4] = 0;		/* not transposed or inverted */
 #else
 	tokens[4] = STATE_MATRIX_TRANSPOSE;
 #endif
 	paramList = prog->Parameters;
 
-	vpi = _mesa_alloc_instructions (prog->NumInstructions + 4);
-	_mesa_init_instructions (vpi, prog->NumInstructions + 4);
+	vpi = _mesa_alloc_instructions(prog->NumInstructions + 4);
+	_mesa_init_instructions(vpi, prog->NumInstructions + 4);
 
-	for (i=0; i < 4; i++) {
+	for (i = 0; i < 4; i++) {
 		GLint idx;
-		tokens[2] = tokens[3] = i;  /* matrix row[i]..row[i] */
+		tokens[2] = tokens[3] = i;	/* matrix row[i]..row[i] */
 		idx = _mesa_add_state_reference(paramList, tokens);
 #ifdef PREFER_DP4
 		vpi[i].Opcode = OPCODE_DP4;
@@ -950,34 +1131,35 @@ static void position_invariant(struct gl_program *prog)
 #endif
 	}
 
-	_mesa_copy_instructions (&vpi[i], prog->Instructions, prog->NumInstructions);
+	_mesa_copy_instructions(&vpi[i], prog->Instructions,
+				prog->NumInstructions);
 
 	free(prog->Instructions);
 
 	prog->Instructions = vpi;
 
 	prog->NumInstructions += 4;
-	vpi = &prog->Instructions[prog->NumInstructions-1];
+	vpi = &prog->Instructions[prog->NumInstructions - 1];
 
 	assert(vpi->Opcode == OPCODE_END);
 }
 
 static void insert_wpos(struct r300_vertex_program *vp,
-		       struct gl_program *prog,
-		       GLuint temp_index)
+			struct gl_program *prog, GLuint temp_index)
 {
 	struct prog_instruction *vpi;
 	struct prog_instruction *vpi_insert;
 	int i = 0;
 
-	vpi = _mesa_alloc_instructions (prog->NumInstructions + 2);
-	_mesa_init_instructions (vpi, prog->NumInstructions + 2);
+	vpi = _mesa_alloc_instructions(prog->NumInstructions + 2);
+	_mesa_init_instructions(vpi, prog->NumInstructions + 2);
 	/* all but END */
-	_mesa_copy_instructions (vpi, prog->Instructions, prog->NumInstructions - 1);
+	_mesa_copy_instructions(vpi, prog->Instructions,
+				prog->NumInstructions - 1);
 	/* END */
-	_mesa_copy_instructions (&vpi[prog->NumInstructions + 1],
-				 &prog->Instructions[prog->NumInstructions - 1],
-				 1);
+	_mesa_copy_instructions(&vpi[prog->NumInstructions + 1],
+				&prog->Instructions[prog->NumInstructions - 1],
+				1);
 	vpi_insert = &vpi[prog->NumInstructions - 1];
 
 	vpi_insert[i].Opcode = OPCODE_MOV;
@@ -995,7 +1177,7 @@ static void insert_wpos(struct r300_vertex_program *vp,
 	vpi_insert[i].Opcode = OPCODE_MOV;
 
 	vpi_insert[i].DstReg.File = PROGRAM_OUTPUT;
-	vpi_insert[i].DstReg.Index = VERT_RESULT_TEX0+vp->wpos_idx;
+	vpi_insert[i].DstReg.Index = VERT_RESULT_TEX0 + vp->wpos_idx;
 	vpi_insert[i].DstReg.WriteMask = WRITEMASK_XYZW;
 	vpi_insert[i].DstReg.CondMask = COND_TR;
 
@@ -1009,7 +1191,7 @@ static void insert_wpos(struct r300_vertex_program *vp,
 	prog->Instructions = vpi;
 
 	prog->NumInstructions += i;
-	vpi = &prog->Instructions[prog->NumInstructions-1];
+	vpi = &prog->Instructions[prog->NumInstructions - 1];
 
 	assert(vpi->Opcode == OPCODE_END);
 }
@@ -1022,9 +1204,9 @@ static void pos_as_texcoord(struct r300_vertex_program *vp,
 	/* should do something else if no temps left... */
 	prog->NumTemporaries++;
 
-	for(vpi = prog->Instructions; vpi->Opcode != OPCODE_END; vpi++){
-		if( vpi->DstReg.File == PROGRAM_OUTPUT &&
-		    vpi->DstReg.Index == VERT_RESULT_HPOS ){
+	for (vpi = prog->Instructions; vpi->Opcode != OPCODE_END; vpi++) {
+		if (vpi->DstReg.File == PROGRAM_OUTPUT &&
+		    vpi->DstReg.Index == VERT_RESULT_HPOS) {
 			vpi->DstReg.File = PROGRAM_TEMPORARY;
 			vpi->DstReg.Index = tempregi;
 		}
@@ -1032,9 +1214,10 @@ static void pos_as_texcoord(struct r300_vertex_program *vp,
 	insert_wpos(vp, prog, tempregi);
 }
 
-static struct r300_vertex_program *build_program(struct r300_vertex_program_key *wanted_key,
-						 struct gl_vertex_program *mesa_vp,
-						 GLint wpos_idx)
+static struct r300_vertex_program *build_program(struct r300_vertex_program_key
+						 *wanted_key,
+						 struct gl_vertex_program
+						 *mesa_vp, GLint wpos_idx)
 {
 	struct r300_vertex_program *vp;
 
@@ -1043,16 +1226,16 @@ static struct r300_vertex_program *build_program(struct r300_vertex_program_key
 
 	vp->wpos_idx = wpos_idx;
 
-	if(mesa_vp->IsPositionInvariant) {
+	if (mesa_vp->IsPositionInvariant) {
 		position_invariant(&mesa_vp->Base);
 	}
 
-	if(wpos_idx > -1)
+	if (wpos_idx > -1)
 		pos_as_texcoord(vp, &mesa_vp->Base);
 
 	assert(mesa_vp->Base.NumInstructions);
 
-	vp->num_temporaries=mesa_vp->Base.NumTemporaries;
+	vp->num_temporaries = mesa_vp->Base.NumTemporaries;
 
 	r300_translate_vertex_shader(vp, mesa_vp->Base.Instructions);
 
@@ -1075,12 +1258,12 @@ void r300_select_vertex_shader(r300ContextPtr r300)
 	wanted_key.OutputsWritten |= 1 << VERT_RESULT_HPOS;
 
 	wpos_idx = -1;
-	if (InputsRead & FRAG_BIT_WPOS){
+	if (InputsRead & FRAG_BIT_WPOS) {
 		for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
 			if (!(InputsRead & (FRAG_BIT_TEX0 << i)))
 				break;
 
-		if(i == ctx->Const.MaxTextureUnits){
+		if (i == ctx->Const.MaxTextureUnits) {
 			fprintf(stderr, "\tno free texcoord found\n");
 			_mesa_exit(-1);
 		}
@@ -1092,26 +1275,27 @@ void r300_select_vertex_shader(r300ContextPtr r300)
 	if (InputsRead & FRAG_BIT_COL0)
 		wanted_key.OutputsWritten |= 1 << VERT_RESULT_COL0;
 
-	if ((InputsRead & FRAG_BIT_COL1) /*||
-	    (InputsRead & FRAG_BIT_FOGC)*/)
+	if ((InputsRead & FRAG_BIT_COL1)	/*||
+						   (InputsRead & FRAG_BIT_FOGC) */ )
 		wanted_key.OutputsWritten |= 1 << VERT_RESULT_COL1;
 
 	for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
 		if (InputsRead & (FRAG_BIT_TEX0 << i))
-			wanted_key.OutputsWritten |= 1 << (VERT_RESULT_TEX0 + i);
+			wanted_key.OutputsWritten |=
+			    1 << (VERT_RESULT_TEX0 + i);
 
 	wanted_key.InputsRead = vpc->mesa_program.Base.InputsRead;
-	if(vpc->mesa_program.IsPositionInvariant) {
+	if (vpc->mesa_program.IsPositionInvariant) {
 		/* we wan't position don't we ? */
 		wanted_key.InputsRead |= (1 << VERT_ATTRIB_POS);
 	}
 
 	for (vp = vpc->progs; vp; vp = vp->next)
-		if (_mesa_memcmp(&vp->key, &wanted_key, sizeof(wanted_key)) == 0) {
+		if (_mesa_memcmp(&vp->key, &wanted_key, sizeof(wanted_key)) ==
+		    0) {
 			r300->selected_vp = vp;
-			return ;
+			return;
 		}
-
 	//_mesa_print_program(&vpc->mesa_program.Base);
 
 	vp = build_program(&wanted_key, &vpc->mesa_program, wpos_idx);
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.h b/src/mesa/drivers/dri/r300/r300_vertprog.h
index 005fca976b..252d5a901f 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.h
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.h
@@ -20,7 +20,6 @@ typedef struct {
 #define VSF_OUT_CLASS_ADDR	1
 #define VSF_OUT_CLASS_RESULT	2
 
-
 /* first DWORD of an instruction */
 
 /* possible operations: 
@@ -57,7 +56,7 @@ typedef struct {
 	   | ((comp_z)<<R300_VPI_IN_Z_SHIFT) \
 	   | ((comp_w)<<R300_VPI_IN_W_SHIFT) \
 	   | ((negate)<<25) | ((class)))
-	   
+
 #define EASY_VSF_SOURCE(in_reg_index, comp_x, comp_y, comp_z, comp_w, class, negate) \
 	MAKE_VSF_SOURCE(in_reg_index, \
 		VSF_IN_COMPONENT_##comp_x, \
@@ -69,8 +68,8 @@ typedef struct {
 /* special sources: */
 
 /* (1.0,1.0,1.0,1.0) vector (ATTR, plain ) */
-#define VSF_ATTR_UNITY(reg) 	EASY_VSF_SOURCE(reg, ONE, ONE, ONE, ONE, ATTR, NONE)  
-#define VSF_UNITY(reg) 	EASY_VSF_SOURCE(reg, ONE, ONE, ONE, ONE, NONE, NONE)  
+#define VSF_ATTR_UNITY(reg) 	EASY_VSF_SOURCE(reg, ONE, ONE, ONE, ONE, ATTR, NONE)
+#define VSF_UNITY(reg) 	EASY_VSF_SOURCE(reg, ONE, ONE, ONE, ONE, NONE, NONE)
 
 /* contents of unmodified register */
 #define VSF_REG(reg) 	EASY_VSF_SOURCE(reg, X, Y, Z, W, ATTR, NONE)