Mesa (master): nv50/ir: make sure that texprep/texquerylod' s args get coalesced

[Ilia Mirkin]

Module: Mesa
Branch: master
Commit: 4ebaabcccb125e3d29ab6e6ac3d23897287d7574
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ebaabcccb125e3d29ab6e6ac3d23897287d7574

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Tue May 13 01:31:20 2014 -0400

nv50/ir: make sure that texprep/texquerylod's args get coalesced

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Ben Skeggs <bskeggs at redhat.com>

---

 src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
index cbf0dd2..e4f56b1 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
@@ -1000,7 +1000,9 @@ GCRA::doCoalesce(ArrayList& insns, unsigned int mask)
       case OP_TXQ:
       case OP_TXD:
       case OP_TXG:
+      case OP_TXLQ:
       case OP_TEXCSAA:
+      case OP_TEXPREP:
          if (!(mask & JOIN_MASK_TEX))
             break;
          for (c = 0; insn->srcExists(c) && c != insn->predSrc; ++c)