From 08f4faa542452a3dbdcc3fd960e75ec043b10390 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 5 Apr 2016 12:39:12 +0200 Subject: [PATCH] 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 Reviewed-by: Ilia Mirkin --- src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- 2.30.2