r5xx: Last emit_sop() for now.

This should also clean up LIT later on.

1 files changed, 5 insertions, 41 deletions

diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c
index d04e65ea60..468fa98fa7 100644
--- a/src/mesa/drivers/dri/r300/r500_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.c
@@ -896,17 +896,8 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
 				/* POW(a,b) = EX2(LN2(a)*b) */
 				src[0] = make_src(fp, fpi->SrcReg[0]);
 				src[1] = make_src(fp, fpi->SrcReg[1]);
-				fp->inst[counter].inst0 = R500_INST_TYPE_ALU | R500_INST_TEX_SEM_WAIT
-					| (R500_WRITEMASK_ARGB << 11);
-				fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-				fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-				fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-					| MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst4 = R500_ALPHA_OP_LN2
-					| R500_ALPHA_ADDRD(get_temp(fp, 0))
-					| R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_sop_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-					| R500_ALU_RGBA_ADDRD(get_temp(fp, 0));
+				emit_sop(fp, counter, fpi, OPCODE_LG2, src[0], make_sop_swizzle(fpi->SrcReg[0]), get_temp(fp, 0));
+				fp->inst[counter].inst0 |= (R500_WRITEMASK_ARGB << 11);
 				counter++;
 				fp->inst[counter].inst0 = R500_INST_TYPE_ALU | (R500_WRITEMASK_ARGB << 11);
 				fp->inst[counter].inst1 = R500_RGB_ADDR0(get_temp(fp, 0))
@@ -925,16 +916,7 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
 					| MAKE_SWIZ_RGBA_C(R500_SWIZ_RGB_ZERO)
 					| MAKE_SWIZ_ALPHA_C(R500_SWIZZLE_ZERO);
 				counter++;
-				emit_alu(fp, counter, fpi);
-				fp->inst[counter].inst1 = R500_RGB_ADDR0(get_temp(fp, 1));
-				fp->inst[counter].inst2 = R500_ALPHA_ADDR0(get_temp(fp, 1));
-				fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-					| MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst4 |= R500_ALPHA_OP_EX2
-					| R500_ALPHA_ADDRD(dest)
-					| R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_sop_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-					| R500_ALU_RGBA_ADDRD(dest);
+				emit_sop(fp, counter, fpi, OPCODE_EX2, get_temp(fp, 1), make_sop_swizzle(fpi->SrcReg[0]), dest);
 				break;
 			case OPCODE_RCP:
 				src[0] = make_src(fp, fpi->SrcReg[0]);
@@ -979,29 +961,11 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
 				/* Do a cosine, then a sine, masking out the channels we want to protect. */
 				/* Cosine only goes in R (x) channel. */
 				fpi->DstReg.WriteMask = 0x1;
-				emit_alu(fp, counter, fpi);
-				fp->inst[counter].inst1 = R500_RGB_ADDR0(get_temp(fp, 1));
-				fp->inst[counter].inst2 = R500_ALPHA_ADDR0(get_temp(fp, 1));
-				fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-					| MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst4 |= R500_ALPHA_OP_COS
-					| R500_ALPHA_ADDRD(dest)
-					| R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_sop_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-					| R500_ALU_RGBA_ADDRD(dest);
+				emit_sop(fp, counter, fpi, OPCODE_COS, get_temp(fp, 1), make_sop_swizzle(fpi->SrcReg[0]), dest);
 				counter++;
 				/* Sine only goes in G (y) channel. */
 				fpi->DstReg.WriteMask = 0x2;
-				emit_alu(fp, counter, fpi);
-				fp->inst[counter].inst1 = R500_RGB_ADDR0(get_temp(fp, 1));
-				fp->inst[counter].inst2 = R500_ALPHA_ADDR0(get_temp(fp, 1));
-				fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-					| MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst4 |= R500_ALPHA_OP_SIN
-					| R500_ALPHA_ADDRD(dest)
-					| R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_sop_swizzle(fpi->SrcReg[0]));
-				fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-					| R500_ALU_RGBA_ADDRD(dest);
+				emit_sop(fp, counter, fpi, OPCODE_SIN, get_temp(fp, 1), make_sop_swizzle(fpi->SrcReg[0]), dest);
 				break;
 			case OPCODE_SGE:
 				src[0] = make_src(fp, fpi->SrcReg[0]);