r600g: no need to do CUBE coordinate handling for TXQ.
authorDave Airlie <airlied@redhat.com>
Sat, 21 Jan 2012 12:15:10 +0000 (22:15 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 21 Jan 2012 12:17:25 +0000 (22:17 +1000)
Fixes texSize on cube.

Signed-off-by: Dave Airlie <airlied@redhat.com>
src/gallium/drivers/r600/r600_shader.c

index cfcca36..e058121 100644 (file)
@@ -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};