r300/compiler: Use memory_pool_array_reserve in r500-fragprog_emit

[mesa.git] / src / mesa / drivers / dri / r300 / compiler / radeon_program_tex.c

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c b/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c
index a8927acdffad18d804483f233cdd72e5d3d4f03d..b4ba0b3f870bba0faf3746cf80d45456ac97b0c5 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c
@@ -27,8 +27,6 @@
 
 #include "radeon_program_tex.h"
 
-#include "../r300_reg.h"
-
 /* Series of transformations to be done on textures. */
 
 static struct rc_src_register shadow_ambient(struct r300_fragment_program_compiler *compiler,
@@ -233,7 +231,7 @@ int radeonTransformTEX(
                                inst_frc->U.I.DstReg.Index = temp;
                                inst_frc->U.I.DstReg.WriteMask = RC_MASK_XYZ;
                                inst_frc->U.I.SrcReg[0] = inst->U.I.SrcReg[0];
-                       } else if (wrapmode == RC_WRAP_MIRROR) {
+                       } else if (wrapmode == RC_WRAP_MIRRORED_REPEAT) {
                                /*
                                 * Function:
                                 *   f(v) = 1 - abs(frac(v * 0.5) * 2 - 1)
@@ -295,6 +293,22 @@ int radeonTransformTEX(
                                inst_add->U.I.SrcReg[1].Swizzle = RC_SWIZZLE_XYZ0;
                                inst_add->U.I.SrcReg[1].Abs = 1;
                                inst_add->U.I.SrcReg[1].Negate = RC_MASK_XYZ;
+                       } else if (wrapmode == RC_WRAP_MIRRORED_CLAMP) {
+                               /*
+                                * Mirrored clamp modes are bloody simple, we just use abs
+                                * to mirror [0, 1] into [-1, 0]. This works for
+                                * all modes i.e. CLAMP, CLAMP_TO_EDGE, and CLAMP_TO_BORDER.
+                                */
+                               struct rc_instruction *inst_mov;
+
+                               inst_mov = rc_insert_new_instruction(c, inst->Prev);
+
+                               inst_mov->U.I.Opcode = RC_OPCODE_MOV;
+                               inst_mov->U.I.DstReg.File = RC_FILE_TEMPORARY;
+                               inst_mov->U.I.DstReg.Index = temp;
+                               inst_mov->U.I.DstReg.WriteMask = RC_MASK_XYZ;
+                               inst_mov->U.I.SrcReg[0] = inst->U.I.SrcReg[0];
+                               inst_mov->U.I.SrcReg[0].Abs = 1;
                        }
 
                        /* Preserve W for TXP/TXB. */