Mesa (master): radeonsi: bump MAX_GS_INVOCATIONS

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Aug  6 08:09:52 2018 -0400

radeonsi: bump MAX_GS_INVOCATIONS

same as the closed driver

Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

---

 src/gallium/drivers/radeonsi/si_get.c           | 4 +++-
 src/gallium/drivers/radeonsi/si_state_shaders.c | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c
index e2e5351423..a282b69a87 100644
--- a/src/gallium/drivers/radeonsi/si_get.c
+++ b/src/gallium/drivers/radeonsi/si_get.c
@@ -263,7 +263,9 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
 	case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
 		return 4095;
 	case PIPE_CAP_MAX_GS_INVOCATIONS:
-		return 32;
+		/* The closed driver exposes 127, but 125 is the greatest
+		 * number that works. */
+		return 125;
 
 	case PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE:
 		return 2048;
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 0766d8cb7d..157a0e37eb 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -657,8 +657,6 @@ static void gfx9_get_gs_info(struct si_shader_selector *es,
 	unsigned max_gs_prims, gs_prims;
 	unsigned min_es_verts, es_verts, worst_case_es_verts;
 
-	assert(gs_num_invocations <= 32); /* GL maximum */
-
 	if (uses_adjacency || gs_num_invocations > 1)
 		max_gs_prims = 127 / gs_num_invocations;
 	else