From b346a84e270a50f0a8f1a6e474a51da04dd72f0e Mon Sep 17 00:00:00 2001 From: Ilia Mirkin <imirkin@alum.mit.edu> Date: Fri, 14 Aug 2015 14:10:36 -0400 Subject: gm107/ir: indirect handle goes first on maxwell also Fixes fs-simple-texture-size.shader_test Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.6" <mesa-stable@lists.freedesktop.org> --- .../drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp index c632e30afae..c3c302da5c8 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp @@ -993,14 +993,10 @@ NVC0LoweringPass::handleTXQ(TexInstruction *txq) txq->tex.r = 0xff; txq->tex.s = 0x1f; - if (chipset < NVISA_GM107_CHIPSET) { - txq->setIndirectR(NULL); - txq->moveSources(0, 1); - txq->setSrc(0, hnd); - txq->tex.rIndirectSrc = 0; - } else { - txq->setIndirectR(hnd); - } + txq->setIndirectR(NULL); + txq->moveSources(0, 1); + txq->setSrc(0, hnd); + txq->tex.rIndirectSrc = 0; } return true; -- cgit v1.2.3