summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2012-01-21 22:15:10 +1000
committerDave Airlie <[email protected]>2012-01-21 22:17:25 +1000
commit261dc72fe3ce969bb4592ac49280147cd72f4414 (patch)
tree0cc57af8612e72973e6bbaab29c4df78a1d65fde /src
parent8b1471f8ca2933a5a4f55be9d0a4db83bdee0435 (diff)
r600g: no need to do CUBE coordinate handling for TXQ.
Fixes texSize on cube. Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/r600/r600_shader.c4
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 cfcca36cb25..e05812191d6 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};