From 8419c5c3ce1489222268bf840c1d165ea8bc53ce Mon Sep 17 00:00:00 2001 From: Grigori Goronzy Date: Thu, 3 Oct 2013 00:12:55 +0200 Subject: r600g: texture offsets for non-TXF instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All texture instructions can use offsets, not just TXF. Offsets into the literals array were wrong, too. Signed-off-by: Marek Olšák --- src/gallium/drivers/r600/r600_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/gallium/drivers/r600') diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 206db04f2b6..d17d6707c63 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -3782,16 +3782,16 @@ static int tgsi_tex(struct r600_shader_ctx *ctx) } } - if (inst->Instruction.Opcode == TGSI_OPCODE_TXF) { - /* get offset values */ - if (inst->Texture.NumOffsets) { - assert(inst->Texture.NumOffsets == 1); - - offset_x = ctx->literals[inst->TexOffsets[0].Index + inst->TexOffsets[0].SwizzleX] << 1; - offset_y = ctx->literals[inst->TexOffsets[0].Index + inst->TexOffsets[0].SwizzleY] << 1; - offset_z = ctx->literals[inst->TexOffsets[0].Index + inst->TexOffsets[0].SwizzleZ] << 1; - } - } else if (inst->Instruction.Opcode == TGSI_OPCODE_TXD) { + /* get offset values */ + if (inst->Texture.NumOffsets) { + assert(inst->Texture.NumOffsets == 1); + + offset_x = ctx->literals[4 * inst->TexOffsets[0].Index + inst->TexOffsets[0].SwizzleX] << 1; + offset_y = ctx->literals[4 * inst->TexOffsets[0].Index + inst->TexOffsets[0].SwizzleY] << 1; + offset_z = ctx->literals[4 * inst->TexOffsets[0].Index + inst->TexOffsets[0].SwizzleZ] << 1; + } + + if (inst->Instruction.Opcode == TGSI_OPCODE_TXD) { /* TGSI moves the sampler to src reg 3 for TXD */ sampler_src_reg = 3; -- cgit v1.2.3