From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Wed, 9 Jul 2014 04:42:52 +0000 (-0400)
Subject: nvc0/ir: account for indirect textures on fermi for txd
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f937875c0289c2ffc2dc8306add72d5de7951ef;p=mesa.git

nvc0/ir: account for indirect textures on fermi for txd

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

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 c102bc5214c..bc95cd843ea 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -787,6 +787,9 @@ NVC0LoweringPass::handleTXD(TexInstruction *txd)
    } else {
       if (txd->tex.useOffsets)
          expected_args++;
+      if (!txd->tex.target.isArray() && (
+                txd->tex.rIndirectSrc >= 0 || txd->tex.sIndirectSrc >= 0))
+         expected_args++;
    }
 
    if (expected_args > 4 ||