From aa0ac4d3fc8a59b9fdb5d1230ebd6e866a3aed49 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 28 Oct 2021 10:57:01 -0400 Subject: [PATCH] zink: inject LOD for sampler version of OpImageQuerySize this is required by spec cc: mesa-stable Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit e8f18385e05db6d14ae6807a529c5d69c38d6091) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 336ccb389a8..a590bcb9aba 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -238,7 +238,7 @@ "description": "zink: inject LOD for sampler version of OpImageQuerySize", "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 56838de15ad..e579f1eb083 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 @@ -3030,6 +3030,14 @@ emit_tex(struct ntv_context *ctx, nir_tex_instr *tex) 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); + /* Additionally, if its Dim is 1D, 2D, 3D, or Cube, + * it must also have either an MS of 1 or a Sampled of 0 or 2. + * - OpImageQuerySize specification + * + * all spirv samplers use these types + */ + if (tex->sampler_dim != GLSL_SAMPLER_DIM_MS && !lod) + lod = emit_uint_const(ctx, 32, 0); SpvId result = spirv_builder_emit_image_query_size(&ctx->builder, dest_type, image, lod);