Mesa (master): zink: check correct caps for PIPE_CAP_IMAGE_LOAD_FORMATTED

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5282210c0b96f75630a5271a8956f8ae69a0ca1b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5282210c0b96f75630a5271a8956f8ae69a0ca1b

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Jan 22 13:19:53 2021 -0500

zink: check correct caps for PIPE_CAP_IMAGE_LOAD_FORMATTED

we actually need more features here than just the one which was checked to
enabled this

Fixes: 2f6f4b613c3 ("zink: export shader image caps using features")

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8656>

---

 src/gallium/drivers/zink/zink_screen.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index bf572f087bd..038f6dd8e32 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -250,7 +250,9 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return screen->info.props.limits.maxViewports;
 
    case PIPE_CAP_IMAGE_LOAD_FORMATTED:
-      return screen->info.feats.features.shaderStorageImageExtendedFormats;
+      return screen->info.feats.features.shaderStorageImageExtendedFormats &&
+             screen->info.feats.features.shaderStorageImageReadWithoutFormat &&
+             screen->info.feats.features.shaderStorageImageWriteWithoutFormat;
 
    case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES:
       return 1;