r5xx: Add OPCODE_POW.

Necessary for Google Earth, among other things.

diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c
index 9e08b27..70940e8 100644 (file)
--- a/src/mesa/drivers/dri/r300/r500_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.c
@@ -93,6 +93,9 @@
 #define MAKE_SWIZ_RGBA_C(x) (x << 14)
 #define MAKE_SWIZ_ALPHA_C(x) (x << 27)
 
+/* Writemasks */
+#define R500_WRITEMASK_ARGB 0xF
+
 static void dump_program(struct r500_fragment_program *fp);
 
 static inline GLuint make_rgb_swizzle(struct prog_src_register src) {
@@ -686,6 +689,50 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
                                        // | R500_ALU_RGBA_ALPHA_SEL_C_SRC2
                                        | MAKE_SWIZ_ALPHA_C(R500_SWIZZLE_ZERO);
                                break;
+                       case OPCODE_POW:
+                               /* 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));
+                               counter++;
+                               fp->inst[counter].inst0 = R500_INST_TYPE_ALU | (R500_WRITEMASK_ARGB << 11);
+                               fp->inst[counter].inst1 = R500_RGB_ADDR0(get_temp(fp, 0))
+                                       | R500_RGB_ADDR1(src[1]);
+                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(get_temp(fp, 0))
+                                       | 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]));
+                               fp->inst[counter].inst4 = R500_ALPHA_OP_MAD
+                                       | R500_ALPHA_ADDRD(get_temp(fp, 1))
+                                       | 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_MAD
+                                       | R500_ALU_RGBA_ADDRD(get_temp(fp, 1))
+                                       | 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);
+                               break;
                        case OPCODE_RCP:
                                src[0] = make_src(fp, fpi->SrcReg[0]);
                                emit_alu(fp, counter, fpi);