From a1d80c6d96c02243303b1cf35617ebbac0692f1d Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 19 Mar 2021 12:07:15 -0400
Subject: [PATCH] zink: more accurately check samplecount caps for shader
 images

lavapipe can only do up to 4bits, so this isn't just a binary check

Fixes: 0daa61553d0 ("zink: check if multisample support exists for shader image formats")

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9713>
---
 src/gallium/drivers/zink/zink_screen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 0e0eeabb4b3..f012c3ee79f 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -796,7 +796,7 @@ zink_is_format_supported(struct pipe_screen *pscreen,
             return false;
       }
       if (bind & PIPE_BIND_SHADER_IMAGE) {
-          if (!screen->info.feats.features.shaderStorageImageMultisample)
+          if (!(screen->info.props.limits.storageImageSampleCounts & sample_mask))
              return false;
       }
    }