Mesa (20.3): gallivm: Fix max const buffer count.

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Nov 30 15:23:04 2020 -0800

gallivm: Fix max const buffer count.

llvmpipe was reporting 32 max const buffers, while sizing its arrays to 16
according to gallivm's #define.

Fixes: 1d35f77228ad ("gallivm,llvmpipe,draw: Support multiple constant buffers.")
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7695>
(cherry picked from commit d90107a2002891ae0f5e9b1ac9ecd8789c9e1969)

---

 .pick_status.json                             | 2 +-
 src/gallium/auxiliary/gallivm/lp_bld_limits.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 57db1a934c4..2db41ddf5f4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "gallivm: Fix max const buffer count.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "1d35f77228ad540a551a8e09e062b764a6e31f5e"
     },
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_limits.h b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
index 9ef11fa5f6b..779a74bc568 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_limits.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
@@ -110,7 +110,7 @@ gallivm_get_shader_param(enum pipe_shader_cap param)
    case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE:
       return LP_MAX_TGSI_CONST_BUFFER_SIZE;
    case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
-      return PIPE_MAX_CONSTANT_BUFFERS;
+      return LP_MAX_TGSI_CONST_BUFFERS;
    case PIPE_SHADER_CAP_MAX_TEMPS:
       return LP_MAX_TGSI_TEMPS;
    case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED: