Mesa (main): zink: reject all storage multisampling if the feature is unsupported

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 675519f1d0eb26ecb5712a8bdbb82d7a92c07ed7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=675519f1d0eb26ecb5712a8bdbb82d7a92c07ed7

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Oct 29 12:13:43 2021 -0400

zink: reject all storage multisampling if the feature is unsupported

this also enables removing a stupid conditional

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13631>

---

 src/gallium/drivers/zink/zink_resource.c | 7 +++----
 src/gallium/drivers/zink/zink_screen.c   | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 7ed7b2b46ed..384d2c7dd42 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -225,10 +225,9 @@ get_image_usage_for_feats(struct zink_screen *screen, VkFormatFeatureFlags feats
       if (feats & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT && (bind & (PIPE_BIND_LINEAR | PIPE_BIND_SHARED)) != (PIPE_BIND_LINEAR | PIPE_BIND_SHARED))
          usage |= VK_IMAGE_USAGE_SAMPLED_BIT;
 
-      if ((templ->nr_samples <= 1 || screen->info.feats.features.shaderStorageImageMultisample) &&
-          (bind & PIPE_BIND_SHADER_IMAGE)) {
-         if (feats & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT)
-            usage |= VK_IMAGE_USAGE_STORAGE_BIT;
+      if ((feats & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) && (bind & PIPE_BIND_SHADER_IMAGE)) {
+         assert(templ->nr_samples <= 1 || screen->info.feats.features.shaderStorageImageMultisample);
+         usage |= VK_IMAGE_USAGE_STORAGE_BIT;
       }
    }
 
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 58a147fa172..0d027d2a55d 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -951,6 +951,9 @@ zink_is_format_supported(struct pipe_screen *pscreen,
 {
    struct zink_screen *screen = zink_screen(pscreen);
 
+   if (storage_sample_count && !screen->info.feats.features.shaderStorageImageMultisample && bind & PIPE_BIND_SHADER_IMAGE)
+      return false;
+
    if (format == PIPE_FORMAT_NONE)
       return screen->info.props.limits.framebufferNoAttachmentsSampleCounts &
              vk_sample_count_flags(sample_count);