Mesa (master): zink: don't export PIPE_CAP_MAX_COMBINED_SHADER_BUFFERS value

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jan 27 09:58:13 2021 -0500

zink: don't export PIPE_CAP_MAX_COMBINED_SHADER_BUFFERS value

gallium automatically sums up the per-stage buffers if this isn't set,
and some drivers (e.g., amdvlk) export UINT_MAX here which breaks the universe

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

---

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

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 42089a38103..87c4e13dd3a 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -325,7 +325,8 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return screen->info.props.limits.maxGeometryShaderInvocations;
 
    case PIPE_CAP_MAX_COMBINED_SHADER_BUFFERS:
-      return screen->info.props.limits.maxDescriptorSetStorageBuffers;
+      /* gallium handles this automatically */
+      return 0;
 
    case PIPE_CAP_MAX_SHADER_BUFFER_SIZE:
       return 65536;