projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50ebe5a)
zink: correct PIPE_SHADER_CAP_MAX_SHADER_IMAGES
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Wed, 13 May 2020 15:13:47 +0000 (17:13 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 14 May 2020 15:58:43 +0000 (15:58 +0000)
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 patch | blob | history

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index e53a49562171b11091be9b4a2b030a136297c74b..b16a2f9662801697bcb7c0820382d19ade57a885 100644 (file)
--- 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: