summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-11-08 11:44:12 -0700
committerBrian <brian.paul@tungstengraphics.com>2007-11-08 11:44:12 -0700
commitae9fe0f981377cb25bc3fe6f23a6ee7e3b73d0c2 (patch)
tree6f65724a6f3bb6a729c289bd43a2e97aabe51663
parentfa63d6d32c93a5d8cd88c0c7d4a8ac4c1c1c1a9d (diff)
Remove TGSI_OPCODE_TXP
Use TGSI_OPCODE_TEX with ExtDivide=TGSI_EXTSWIZZLE_W instead.
-rw-r--r--src/mesa/pipe/i915simple/i915_fpc_translate.c4
-rw-r--r--src/mesa/pipe/tgsi/exec/tgsi_token.h10
2 files changed, 5 insertions, 9 deletions
diff --git a/src/mesa/pipe/i915simple/i915_fpc_translate.c b/src/mesa/pipe/i915simple/i915_fpc_translate.c
index b867b87e74..d74da85216 100644
--- 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 8d5992facb..2b922c7aef 100644
--- 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] */