Track Radeon driver symlinks in Git.

[mesa.git] / src / mesa / drivers / dri / r300 / radeon_program_alu.c

diff --git a/src/mesa/drivers/dri/r300/radeon_program_alu.c b/src/mesa/drivers/dri/r300/radeon_program_alu.c
index 1ef71e74dcf27c4c956d7b06cae73a1b8231985d..8283723bad795f09dc939391f7748d875a010396 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_program_alu.c
+++ b/src/mesa/drivers/dri/r300/radeon_program_alu.c
@@ -81,18 +81,6 @@ static struct prog_instruction *emit3(struct gl_program* p,
        return fpi;
 }
 
-static void set_swizzle(struct prog_src_register *SrcReg, int coordinate, int swz)
-{
-       SrcReg->Swizzle &= ~(7 << (3*coordinate));
-       SrcReg->Swizzle |= swz << (3*coordinate);
-}
-
-static void set_negate_base(struct prog_src_register *SrcReg, int coordinate, int negate)
-{
-       SrcReg->NegateBase &= ~(1 << coordinate);
-       SrcReg->NegateBase |= (negate << coordinate);
-}
-
 static struct prog_dst_register dstreg(int file, int index)
 {
        struct prog_dst_register dst;
@@ -156,15 +144,14 @@ static struct prog_src_register absolute(struct prog_src_register reg)
 {
        struct prog_src_register newreg = reg;
        newreg.Abs = 1;
-       newreg.NegateBase = 0;
-       newreg.NegateAbs = 0;
+       newreg.Negate = NEGATE_NONE;
        return newreg;
 }
 
 static struct prog_src_register negate(struct prog_src_register reg)
 {
        struct prog_src_register newreg = reg;
-       newreg.NegateAbs = !newreg.NegateAbs;
+       newreg.Negate = newreg.Negate ^ NEGATE_XYZW;
        return newreg;
 }
 
@@ -189,8 +176,7 @@ static void transform_ABS(struct radeon_transform_context* t,
 {
        struct prog_src_register src = inst->SrcReg[0];
        src.Abs = 1;
-       src.NegateBase = 0;
-       src.NegateAbs = 0;
+       src.Negate = NEGATE_NONE;
        emit1(t->Program, OPCODE_MOV, inst->SaturateMode, inst->DstReg, src);
 }
 
@@ -198,18 +184,9 @@ static void transform_DPH(struct radeon_transform_context* t,
        struct prog_instruction* inst)
 {
        struct prog_src_register src0 = inst->SrcReg[0];
-       if (src0.NegateAbs) {
-               if (src0.Abs) {
-                       int tempreg = radeonFindFreeTemporary(t);
-                       emit1(t->Program, OPCODE_MOV, 0, dstreg(PROGRAM_TEMPORARY, tempreg), src0);
-                       src0 = srcreg(src0.File, src0.Index);
-               } else {
-                       src0.NegateAbs = 0;
-                       src0.NegateBase ^= NEGATE_XYZW;
-               }
-       }
-       set_swizzle(&src0, 3, SWIZZLE_ONE);
-       set_negate_base(&src0, 3, 0);
+       src0.Negate &= ~NEGATE_W;
+       src0.Swizzle &= ~(7 << (3 * 3));
+       src0.Swizzle |= SWIZZLE_ONE << (3 * 3);
        emit2(t->Program, OPCODE_DP4, inst->SaturateMode, inst->DstReg, src0, inst->SrcReg[1]);
 }
 
@@ -649,7 +626,7 @@ GLboolean radeonTransformDeriv(struct radeon_transform_context* t,
 
        B.Swizzle = MAKE_SWIZZLE4(SWIZZLE_ONE, SWIZZLE_ONE,
                                                SWIZZLE_ONE, SWIZZLE_ONE);
-       B.NegateBase = NEGATE_XYZW;
+       B.Negate = NEGATE_XYZW;
 
        emit2(t->Program, inst->Opcode, inst->SaturateMode, inst->DstReg,
                inst->SrcReg[0], B);