Mesa (main): gallium: Bump PIPE_MAX_SHADER_IMAGES to 64

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 370f02bf0259bcd4e5040afc20a5669526d84e47
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=370f02bf0259bcd4e5040afc20a5669526d84e47

Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date:   Fri Apr 15 17:14:26 2022 -0500

gallium: Bump PIPE_MAX_SHADER_IMAGES to 64

This is required by OpenCL

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15988>

---

 src/gallium/auxiliary/util/u_threaded_context.h | 2 +-
 src/gallium/include/pipe/p_state.h              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_threaded_context.h b/src/gallium/auxiliary/util/u_threaded_context.h
index 67d2d69d271..848c56abb89 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.h
+++ b/src/gallium/auxiliary/util/u_threaded_context.h
@@ -514,7 +514,7 @@ struct threaded_context {
    uint32_t shader_buffers[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_BUFFERS];
    uint32_t image_buffers[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_IMAGES];
    uint32_t shader_buffers_writeable_mask[PIPE_SHADER_TYPES];
-   uint32_t image_buffers_writeable_mask[PIPE_SHADER_TYPES];
+   uint64_t image_buffers_writeable_mask[PIPE_SHADER_TYPES];
    /* Don't use PIPE_MAX_SHADER_SAMPLER_VIEWS because it's too large. */
    uint32_t sampler_buffers[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];
 
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 99ae182999c..46613808fd7 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -67,7 +67,7 @@ struct gl_buffer_object;
 #define PIPE_MAX_SHADER_OUTPUTS   80 /* 32 GENERIC + 32 PATCH + 16 others */
 #define PIPE_MAX_SHADER_SAMPLER_VIEWS 128
 #define PIPE_MAX_SHADER_BUFFERS   32
-#define PIPE_MAX_SHADER_IMAGES    32
+#define PIPE_MAX_SHADER_IMAGES    64
 #define PIPE_MAX_TEXTURE_LEVELS   16
 #define PIPE_MAX_SO_BUFFERS        4
 #define PIPE_MAX_SO_OUTPUTS       64