From 7ce1dcb5eb23624eb24f87d4cbb73b0a177e3d79 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 26 May 2021 10:11:01 -0400 Subject: [PATCH] zink: remove weird lod hack for texturing this breaks texturing in non-fragment stages and is unnecessary due to using nir_lower_tex Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Erik Faye-Lund Part-of: (cherry picked from commit a9d3b0050251821d3c2571fa310fc8030a7e9e72) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2108e63adb5..460a1c3658f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -517,7 +517,7 @@ "description": "zink: remove weird lod hack for texturing", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "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 d24f39dee3f..405c0048e26 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 @@ -2878,11 +2878,6 @@ emit_tex(struct ntv_context *ctx, nir_tex_instr *tex) } } - if (lod == 0 && ctx->stage != MESA_SHADER_FRAGMENT) { - lod = emit_float_const(ctx, 32, 0.0f); - assert(lod != 0); - } - unsigned texture_index = tex->texture_index; if (!tex_offset) { /* convert constant index back to base + offset */