Mesa (17.1): nv50/ir: properly set sType for TXF ops to U32

[Andres Gomez]

Module: Mesa
Branch: 17.1
Commit: 52b0ad8666b4f9c4acd206ae231b62ee1b91561b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=52b0ad8666b4f9c4acd206ae231b62ee1b91561b

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Aug 23 23:15:48 2017 -0400

nv50/ir: properly set sType for TXF ops to U32

All of the coordinates and LOD args are integers for TXF. This mostly
doesn't matter, except for converting into a levelZero=true operation by
removing an explicit zero LOD. For the comparison against zero to work
properly, the sType of the instruction has to be set correctly.

Fixes: KHR-GL45.robust_buffer_access_behavior.texel_fetch
Reported-by: Karol Herbst <karolherbst at gmail.com>
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 96be442b7795a6eb3d50f4061f2b98dddc39aa4d)

---

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

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
index b67a1ddbd5..1a6f647c6c 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
@@ -905,6 +905,9 @@ TexInstruction::TexInstruction(Function *fn, operation op)
 
    tex.rIndirectSrc = -1;
    tex.sIndirectSrc = -1;
+
+   if (op == OP_TXF)
+      sType = TYPE_U32;
 }
 
 TexInstruction::~TexInstruction()