Module: Mesa Branch: staging/21.3 Commit: f47efe8d7995334e347e1bf790c555554d130187 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f47efe8d7995334e347e1bf790c555554d130187
Author: Mike Blumenkrantz <[email protected]> Date: Fri Oct 29 12:11:14 2021 -0400 zink: add SpvCapabilityStorageImageMultisample for multisampled storage images cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13631> (cherry picked from commit aacdc6eb44cfcfe28e8a3bef90350f514219ac38) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 28c907ae4ac..10bbba00a56 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -148,7 +148,7 @@ "description": "zink: add SpvCapabilityStorageImageMultisample for multisampled storage images", "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/spirv_builder.c b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c index 339af44f4c6..f859a3372e0 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c +++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c @@ -1224,6 +1224,8 @@ spirv_builder_type_image(struct spirv_builder *b, SpvId sampled_type, sampled_type, dim, depth ? 1 : 0, arrayed ? 1 : 0, ms ? 1 : 0, sampled, image_format }; + if (sampled == 2 && ms) + spirv_builder_emit_cap(b, SpvCapabilityStorageImageMultisample); return get_type_def(b, SpvOpTypeImage, args, ARRAY_SIZE(args)); }
