zink: be more permissive for injecting LOD into texture() instructions
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Thu, 28 Oct 2021 13:53:02 +0000 (09:53 -0400)
committerMarge Bot <emma+marge@anholt.net>
Fri, 29 Oct 2021 19:05:07 +0000 (19:05 +0000)
there's other variants of implicit lod sampling, and none of them are valid
outside fragment stage

Fixes: 3ad06b69490 ("zink: always use explicit lod for texture() when legal in non-fragment stages")

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13585>

src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c

index 6a5865d..c09e346 100644 (file)
@@ -2976,7 +2976,7 @@ emit_tex(struct ntv_context *ctx, nir_tex_instr *tex)
    if (!tex_instr_is_lod_allowed(tex))
       lod = 0;
    else if (ctx->stage != MESA_SHADER_FRAGMENT &&
-            tex->op == nir_texop_tex && ctx->explicit_lod && !lod && !proj && !bias && !dref && !dx && !dy)
+            tex->op == nir_texop_tex && ctx->explicit_lod && !lod)
       lod = emit_float_const(ctx, 32, 0.0);
    if (tex->op == nir_texop_txs) {
       SpvId image = spirv_builder_emit_image(&ctx->builder, image_type, load);