From: Ben Skeggs <skeggsb@gmail.com>
Date: Sun, 18 Nov 2007 10:47:18 +0000 (+1100)
Subject: nv40: support TXP again
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1d622190f2e7dba578d693845277d6f32504b09;p=mesa.git

nv40: support TXP again
---

diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/mesa/pipe/nv40/nv40_fragprog.c
index 48b783eebef..3be13143476 100644
--- a/src/mesa/pipe/nv40/nv40_fragprog.c
+++ b/src/mesa/pipe/nv40/nv40_fragprog.c
@@ -446,16 +446,15 @@ nv40_fragprog_parse_instruction(struct nv40_fpc *fpc,
 		arith(fpc, sat, ADD, dst, mask, src[0], neg(src[1]), none);
 		break;
 	case TGSI_OPCODE_TEX:
-		tex(fpc, sat, TEX, unit, dst, mask, src[0], none, none);
+		if (finst->FullSrcRegisters[0].SrcRegisterExtSwz.ExtDivide ==
+				TGSI_EXTSWIZZLE_W) {
+			tex(fpc, sat, TXP, unit, dst, mask, src[0], none, none);
+		} else
+			tex(fpc, sat, TEX, unit, dst, mask, src[0], none, none);
 		break;
 	case TGSI_OPCODE_TXB:
 		tex(fpc, sat, TXB, unit, dst, mask, src[0], none, none);
 		break;
-#if 0 /* XXX: reimplement on top of TEX */
-	case TGSI_OPCODE_TXP:
-		tex(fpc, sat, TXP, unit, dst, mask, src[0], none, none);
-		break;
-#endif
 	case TGSI_OPCODE_XPD:
 		tmp = temp(fpc);
 		arith(fpc, 0, MUL, tmp, mask,