Mesa (master): zink: correct PIPE_SHADER_CAP_MAX_SHADER_IMAGES

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed May 13 17:13:47 2020 +0200

zink: correct PIPE_SHADER_CAP_MAX_SHADER_IMAGES

We don't support shader-images yet, so this is premature to expose.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5024>

---

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

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index e53a4956217..b16a2f96628 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -449,8 +449,12 @@ zink_get_shader_param(struct pipe_screen *pscreen,
       return (1 << PIPE_SHADER_IR_NIR) | (1 << PIPE_SHADER_IR_TGSI);
 
    case PIPE_SHADER_CAP_MAX_SHADER_IMAGES:
+#if 0 /* TODO: needs compiler support */
       return MIN2(screen->props.limits.maxPerStageDescriptorStorageImages,
                   PIPE_MAX_SHADER_IMAGES);
+#else
+      return 0;
+#endif
 
    case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD:
    case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: