commit 589d918a4f9da83e3ae441aa674372a141d23349
author Jason Ekstrand <jason@jlekstrand.net> Mon Aug 31 19:33:51 2020 -0500
committer Karol Herbst <kherbst@redhat.com> Tue Oct 20 23:46:42 2020 +0200
tree 6e12e8f9c306e2cbceac80879debdb9c9ca52033
parent 2015a109ff287cdf04607d5acc540aae2e87daa3

spirv: Add 0.5 to integer coordinates for OpImageSampleExplicitLod

Just casting to a float is insufficient because that gives us the upper-left corner
of the texel rather than the center.

Fixes: 701cb9d60c03 "nir/vtn: Handle integer sampling coordinates"

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7069>

src/compiler/spirv/spirv_to_nir.c

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index d88ae4c..ec976c4 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -2661,7 +2661,9 @@
                      "Unless the Kernel capability is being used, the coordinate parameter "
                      "OpImageSampleExplicitLod must be floating point.");
 
-         p->src = nir_src_for_ssa(nir_i2f32(&b->nb, p->src.ssa));
+         p->src = nir_src_for_ssa(
+            nir_fadd(&b->nb, nir_i2f32(&b->nb, p->src.ssa),
+                             nir_imm_float(&b->nb, 0.5)));
       }
 
       p->src_type = nir_tex_src_coord;