Mesa (staging/22.0): zink: clamp out min_lod operands for explicit lod ops

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 9e86e9bfb0c110ca18bf67b42214964f7940a9a1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e86e9bfb0c110ca18bf67b42214964f7940a9a1

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed May 11 16:02:51 2022 -0400

zink: clamp out min_lod operands for explicit lod ops

this is illegal (and nonsensical)

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16456>
(cherry picked from commit 63dc39ac9047fce206ac11b6e556b6e9a0f8a07b)

---

 .pick_status.json                                    | 2 +-
 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3c6cb6556a1..2d874cea485 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1892,7 +1892,7 @@
         "description": "zink: clamp out min_lod operands for explicit lod ops",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 49f60a92b4a..8812e0c3a11 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -3247,6 +3247,8 @@ emit_tex(struct ntv_context *ctx, nir_tex_instr *tex)
          result = spirv_builder_emit_image_fetch(&ctx->builder, actual_dest_type,
                                                  image, coord, lod, sample, const_offset, offset, tex->is_sparse);
    } else {
+      if (tex->op == nir_texop_txl)
+         min_lod = 0;
       result = spirv_builder_emit_image_sample(&ctx->builder,
                                                actual_dest_type, load,
                                                coord,