From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 5 Apr 2016 10:39:12 +0000 (+0200)
Subject: nvc0/ir: fix constraints for OP_SUSTx on Kepler
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=08f4faa542452a3dbdcc3fd960e75ec043b10390;p=mesa.git

nvc0/ir: fix constraints for OP_SUSTx on Kepler

Destination type is actually always 32-bits, so typeSizeof() returns 4
and no sources are condensed.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
index 500ab8915de..7e8bb17fb25 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
@@ -2131,7 +2131,9 @@ RegAlloc::InsertConstraintsPass::texConstraintNVE0(TexInstruction *tex)
    condenseDefs(tex);
 
    if (tex->op == OP_SUSTB || tex->op == OP_SUSTP) {
-      condenseSrcs(tex, 3, (3 + typeSizeof(tex->dType) / 4) - 1);
+      int n = tex->srcCount(0xff);
+      if (n > 4)
+         condenseSrcs(tex, 3, n - 1);
    } else
    if (isTextureOp(tex->op)) {
       int n = tex->srcCount(0xff, true);