From: Marek Olšák Date: Mon, 6 Aug 2018 12:09:52 +0000 (-0400) Subject: radeonsi: bump MAX_GS_INVOCATIONS X-Git-Tag: android-x86-8.1-r1~1307 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5693ca865dcb1efeee884dc99dbe31a267c453f6;p=android-x86%2Fexternal-mesa.git radeonsi: bump MAX_GS_INVOCATIONS same as the closed driver Tested-by: Dieter Nützel --- diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index e2e53514239..a282b69a87b 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 0766d8cb7d8..157a0e37eb0 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