diff options
| author | Marek Olšák <[email protected]> | 2018-08-06 08:09:52 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-08-23 16:56:17 -0400 |
| commit | 5693ca865dcb1efeee884dc99dbe31a267c453f6 (patch) | |
| tree | 9a759874e56cea82f636f5e101f0a324f9a069c5 | |
| parent | d3c1b212bc72494bdcca617115cda4e0b55d2dbe (diff) | |
radeonsi: bump MAX_GS_INVOCATIONS
same as the closed driver
Tested-by: Dieter Nützel <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_get.c | 4 | ||||
| -rw-r--r-- | 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 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 |