r5xx: Fix false error with DP3/DP4.

DP3/DP4 only takes two arguments, but tried to load three, causing
a false fallback to the dumb shader.

diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c
index c753c2b6f7a375148b7281cc9c8efb5acea7254b..f90f467cb794079c530da946783f399d23f86134 100644 (file)
--- a/src/mesa/drivers/dri/r300/r500_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.c
@@ -418,13 +418,12 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
                        case OPCODE_DP3:
                                src[0] = make_src(fp, fpi->SrcReg[0]);
                                src[1] = make_src(fp, fpi->SrcReg[1]);
-                               src[2] = make_src(fp, fpi->SrcReg[2]);
                                fp->inst[counter].inst0 = R500_INST_TYPE_ALU
-                                       | mask;
+                                       | R500_INST_TEX_SEM_WAIT | mask;
                                fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]) | R500_RGB_ADDR2(src[2]);
+                                       | R500_RGB_ADDR1(src[1]);
                                fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]) | R500_ALPHA_ADDR2(src[2]);
+                                       | R500_ALPHA_ADDR1(src[1]);
                                fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
                                        | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
                                        | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
@@ -433,23 +432,18 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
                                        | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
                                        | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
                                fp->inst[counter].inst5 = R500_ALU_RGBA_OP_DP3
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       | R500_ALU_RGBA_SEL_C_SRC2
-                                       | MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[2]))
-                                       | R500_ALU_RGBA_ALPHA_SEL_C_SRC2
-                                       | MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[2]));
+                                       | R500_ALU_RGBA_ADDRD(dest);
                                break;
                        case OPCODE_DP4:
                                src[0] = make_src(fp, fpi->SrcReg[0]);
                                src[1] = make_src(fp, fpi->SrcReg[1]);
-                               src[2] = make_src(fp, fpi->SrcReg[2]);
                                /* Based on DP3 */
                                fp->inst[counter].inst0 = R500_INST_TYPE_ALU
-                                       | mask;
+                                       | R500_INST_TEX_SEM_WAIT | mask;
                                fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]) | R500_RGB_ADDR2(src[2]);
+                                       | R500_RGB_ADDR1(src[1]);
                                fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]) | R500_ALPHA_ADDR2(src[2]);
+                                       | R500_ALPHA_ADDR1(src[1]);
                                fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
                                        | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
                                        | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
@@ -458,11 +452,7 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
                                        | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
                                        | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
                                fp->inst[counter].inst5 = R500_ALU_RGBA_OP_DP4
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       | R500_ALU_RGBA_SEL_C_SRC2
-                                       | MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[2]))
-                                       | R500_ALU_RGBA_ALPHA_SEL_C_SRC2
-                                       | MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[2]));
+                                       | R500_ALU_RGBA_ADDRD(dest);
                                break;
                        case OPCODE_MAD:
                                src[0] = make_src(fp, fpi->SrcReg[0]);