nv50/ir: fix textureGrad with offsets and in non-FPs

2 files changed, 3 insertions, 0 deletions

diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir.h b/src/gallium/drivers/nv50/codegen/nv50_ir.h
index 88306087a98..cf7bd3c0d05 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir.h
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir.h
@@ -803,6 +803,7 @@ public:
 
       bool liveOnly; // only execute on live pixels of a quad (optimization)
       bool levelZero;
+      bool derivAll;
 
       int8_t useOffsets; // 0, 1, or 4 for textureGatherOffsets
       int8_t offset[4][3];
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
index ea5f4723f3c..ff6d9666a19 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
@@ -933,6 +933,8 @@ RegAlloc::InsertConstraintsPass::visit(BasicBlock *bb)
             if (!tex->tex.target.isArray() &&
                 (tex->tex.rIndirectSrc >= 0 || tex->tex.sIndirectSrc >= 0))
                ++s;
+	    if (tex->op == OP_TXD && tex->tex.useOffsets)
+               ++s;
             n = tex->srcCount(0xff) - s;
             assert(n <= 4);
          }