Mesa (master): r600g: no need to do CUBE coordinate handling for TXQ.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 261dc72fe3ce969bb4592ac49280147cd72f4414
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=261dc72fe3ce969bb4592ac49280147cd72f4414

Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Jan 21 22:15:10 2012 +1000

r600g: no need to do CUBE coordinate handling for TXQ.

Fixes texSize on cube.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/r600/r600_shader.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index cfcca36..e058121 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -3184,7 +3184,9 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 		src_gpr = ctx->temp_reg;
 	}
 
-	if (inst->Texture.Texture == TGSI_TEXTURE_CUBE) {
+	if (inst->Texture.Texture == TGSI_TEXTURE_CUBE &&
+	    inst->Instruction.Opcode != TGSI_OPCODE_TXQ) {
+
 		static const unsigned src0_swizzle[] = {2, 2, 0, 1};
 		static const unsigned src1_swizzle[] = {1, 0, 2, 2};