Mesa (11.1): nvc/ir: remove duplicate variable declaration

Emil Velikov evelikov at kemper.freedesktop.org
Fri Apr 15 09:06:54 UTC 2016


Module: Mesa
Branch: 11.1
Commit: fd1e4331ee40627e5a8cad67b930bde4732ef93f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd1e4331ee40627e5a8cad67b930bde4732ef93f

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Fri Apr 15 10:04:57 2016 +0100

nvc/ir: remove duplicate variable declaration

Missed out with earlier commit while resolving conflicts.

Fixes: a785cccc706 "nvc0/ir: fix picking of coordinates from tex
instruction for textureGrad"
Reported-by: Ilia Mirkin <imirkin at alum.mit.edu>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 1 -
 1 file changed, 1 deletion(-)

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 c015ee7..087e300 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -850,7 +850,6 @@ NVC0LoweringPass::handleManualTXD(TexInstruction *i)
    Value *zero = bld.loadImm(bld.getSSA(), 0);
    int l, c;
    const int dim = i->tex.target.getDim();
-   const int array = i->tex.target.isArray();
 
    // This function is invoked after handleTEX lowering, so we have to expect
    // the arguments in the order that the hw wants them. For Fermi, array and




More information about the mesa-commit mailing list