Mesa (main): radv: Use 16-bits to store push constant indices.

[GitLab Mirror]

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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Mon Jan 10 23:16:20 2022 +0100

radv: Use 16-bits to store push constant indices.

Otherwise things horrible go wrong when we get 256 bytes of push
constants.

Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14485>

---

 src/amd/vulkan/radv_shader.h      | 4 ++--
 src/amd/vulkan/radv_shader_args.c | 2 +-
 src/amd/vulkan/radv_shader_info.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index 29402fb294f..978b086c540 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -231,8 +231,8 @@ struct gfx10_ngg_info {
 struct radv_shader_info {
    bool loads_push_constants;
    bool loads_dynamic_offsets;
-   uint8_t min_push_constant_used;
-   uint8_t max_push_constant_used;
+   uint16_t min_push_constant_used;
+   uint16_t max_push_constant_used;
    bool has_only_32bit_push_constants;
    bool has_indirect_push_constants;
    uint32_t desc_set_used_mask;
diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index e8f890b4607..e2b1c462f45 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -155,7 +155,7 @@ allocate_inline_push_consts(const struct radv_shader_info *info,
    uint8_t remaining_sgprs = user_sgpr_info->remaining_sgprs;
 
    /* Only supported if shaders use push constants. */
-   if (info->min_push_constant_used == UINT8_MAX)
+   if (info->min_push_constant_used == UINT16_MAX)
       return;
 
    /* Only supported if shaders don't have indirect push constants. */
diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 8f5d3759646..c8ccaa0c2ea 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -619,7 +619,7 @@ void
 radv_nir_shader_info_init(struct radv_shader_info *info)
 {
    /* Assume that shaders only have 32-bit push constants by default. */
-   info->min_push_constant_used = UINT8_MAX;
+   info->min_push_constant_used = UINT16_MAX;
    info->has_only_32bit_push_constants = true;
 }