Mesa (main): st/mesa: limit MaxComputeWorkGroupCount to INT_MAX - 1 due to failing tests

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Jun  5 23:16:29 2022 -0400

st/mesa: limit MaxComputeWorkGroupCount to INT_MAX - 1 due to failing tests

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16881>

---

 src/mesa/state_tracker/st_extensions.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 759527f0afe..1761f9e38de 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1634,7 +1634,8 @@ void st_init_extensions(struct pipe_screen *screen,
          consts->MaxComputeSharedMemorySize = max_local_size;
 
          for (i = 0; i < 3; i++) {
-            consts->MaxComputeWorkGroupCount[i] = grid_size[i];
+            /* There are tests that fail if we report more that INT_MAX - 1. */
+            consts->MaxComputeWorkGroupCount[i] = MIN2(grid_size[i], INT_MAX - 1);
             consts->MaxComputeWorkGroupSize[i] = block_size[i];
          }