Remove TGSI_OPCODE_TXP

Use TGSI_OPCODE_TEX with ExtDivide=TGSI_EXTSWIZZLE_W instead.

diff --git a/src/mesa/pipe/i915simple/i915_fpc_translate.c b/src/mesa/pipe/i915simple/i915_fpc_translate.c
index b867b87..d74da85 100644 (file)
--- a/src/mesa/pipe/i915simple/i915_fpc_translate.c
+++ b/src/mesa/pipe/i915simple/i915_fpc_translate.c
@@ -844,10 +844,6 @@ i915_translate_instruction(struct i915_fp_compile *p,
       emit_tex(p, inst, T0_TEXLDB);
       break;
 
-   case TGSI_OPCODE_TXP:
-      emit_tex(p, inst, T0_TEXLDP);
-      break;
-
    case TGSI_OPCODE_XPD:
       /* Cross product:
        *      result.x = src0.y * src1.z - src0.z * src1.y;

diff --git a/src/mesa/pipe/tgsi/exec/tgsi_token.h b/src/mesa/pipe/tgsi/exec/tgsi_token.h
index 8d5992f..2b922c7 100644 (file)
--- a/src/mesa/pipe/tgsi/exec/tgsi_token.h
+++ b/src/mesa/pipe/tgsi/exec/tgsi_token.h
@@ -265,7 +265,7 @@ struct tgsi_immediate_float32
 /* TGSI_OPCODE_SUB */
 #define TGSI_OPCODE_TEX                 52
 #define TGSI_OPCODE_TXD                 53
-#define TGSI_OPCODE_TXP                 132
+/* TGSI_OPCODE_TXP */
 #define TGSI_OPCODE_UP2H                54
 #define TGSI_OPCODE_UP2US               55
 #define TGSI_OPCODE_UP4B                56
@@ -909,7 +909,7 @@ struct tgsi_immediate_float32
 /* TGSI_OPCODE_TEXKILL */
 /* TGSI_OPCODE_TEXLD */
 #define TGSI_OPCODE_TEXLDB              TGSI_OPCODE_TXB
-#define TGSI_OPCODE_TEXLDP              TGSI_OPCODE_TXP
+/* TGSI_OPCODE_TEXLDP */
 /* CMP - use TGSI_OPCODE_CND0 */
 #define TGSI_OPCODE_DP2ADD              TGSI_OPCODE_DP2A
 
@@ -1100,10 +1100,10 @@ struct tgsi_immediate_float32
 /* TGSI_OPCODE_MOVA */
 /* TGSI_OPCODE_LOGP */
 
-#define TGSI_OPCODE_KIL                 133  /* unpredicated kill */
-#define TGSI_OPCODE_END                 134  /* aka HALT */
+#define TGSI_OPCODE_KIL                 132  /* unpredicated kill */
+#define TGSI_OPCODE_END                 133  /* aka HALT */
 
-#define TGSI_OPCODE_LAST                135
+#define TGSI_OPCODE_LAST                134
 
 #define TGSI_SAT_NONE            0  /* do not saturate */
 #define TGSI_SAT_ZERO_ONE        1  /* clamp to [0,1] */