Module: Mesa Branch: main Commit: 387f6e01733de653ed94a764769910c8a3bd9a2d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=387f6e01733de653ed94a764769910c8a3bd9a2d
Author: Mike Blumenkrantz <[email protected]> Date: Fri Apr 8 13:06:44 2022 -0400 zink: don't emit SpvCapabilityStorageImageMultisample for fbfetch Acked-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15823> --- src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f1a8496895..7c072072305 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c +++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c @@ -1273,7 +1273,7 @@ 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) + if (sampled == 2 && ms && dim != SpvDimSubpassData) spirv_builder_emit_cap(b, SpvCapabilityStorageImageMultisample); return get_type_def(b, SpvOpTypeImage, args, ARRAY_SIZE(args)); }
