diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-10-28 10:57:01 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-11-03 20:15:47 +0000 |
| commit | 6b6f321e281d77791a7274a05a8b116183062e98 (patch) | |
| tree | 7f8e8d38865f404290561b1376d85d13473d719e | |
| parent | 3f46f5378118524a31a87a645d7fb2b5e374fea8 (diff) | |
| download | mesa-6b6f321e281d77791a7274a05a8b116183062e98.tar.gz | |
zink: inject LOD for sampler version of OpImageQuerySize
this is required by spec
cc: mesa-stable
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13585>
(cherry picked from commit e8f18385e05db6d14ae6807a529c5d69c38d6091)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 8deff7d49d3..f5793bbee48 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -787,7 +787,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 68e0db3bf81..78e4f5334cd 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 @@ -3224,6 +3224,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); |