radeonsi: use a single descriptor for the GSVS ring

We can hardcode all of the fields for swizzling in the geometry shader.

The advantage is that we use fewer descriptor slots and we no longer have to
update any of the (ring) descriptors when the geometry shader changes.

Reviewed-by: Marek Olšák <[email protected]>

1 files changed, 1 insertions, 36 deletions

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index ea715695b97..1e9f5f0a217 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -2039,47 +2039,14 @@ static bool si_update_gs_ring_buffers(struct si_context *sctx)
 				   false, false, 0, 0, 0);
 	}
 	if (sctx->gsvs_ring) {
-		si_set_ring_buffer(&sctx->b.b, SI_VS_RING_GSVS,
+		si_set_ring_buffer(&sctx->b.b, SI_RING_GSVS,
 				   sctx->gsvs_ring, 0, sctx->gsvs_ring->width0,
 				   false, false, 0, 0, 0);
-
-		/* Also update SI_GS_RING_GSVSi descriptors. */
-		sctx->last_gsvs_itemsize = 0;
 	}
 
 	return true;
 }
 
-static void si_update_gsvs_ring_bindings(struct si_context *sctx)
-{
-	unsigned gsvs_itemsize = sctx->gs_shader.cso->max_gsvs_emit_size;
-	uint64_t offset;
-
-	if (!sctx->gsvs_ring || gsvs_itemsize == sctx->last_gsvs_itemsize)
-		return;
-
-	sctx->last_gsvs_itemsize = gsvs_itemsize;
-
-	si_set_ring_buffer(&sctx->b.b, SI_GS_RING_GSVS0,
-			   sctx->gsvs_ring, gsvs_itemsize,
-			   64, true, true, 4, 16, 0);
-
-	offset = gsvs_itemsize * 64;
-	si_set_ring_buffer(&sctx->b.b, SI_GS_RING_GSVS1,
-			   sctx->gsvs_ring, gsvs_itemsize,
-			   64, true, true, 4, 16, offset);
-
-	offset = (gsvs_itemsize * 2) * 64;
-	si_set_ring_buffer(&sctx->b.b, SI_GS_RING_GSVS2,
-			   sctx->gsvs_ring, gsvs_itemsize,
-			   64, true, true, 4, 16, offset);
-
-	offset = (gsvs_itemsize * 3) * 64;
-	si_set_ring_buffer(&sctx->b.b, SI_GS_RING_GSVS3,
-			   sctx->gsvs_ring, gsvs_itemsize,
-			   64, true, true, 4, 16, offset);
-}
-
 /**
  * @returns 1 if \p sel has been updated to use a new scratch buffer
  *          0 if not
@@ -2469,8 +2436,6 @@ bool si_update_shaders(struct si_context *sctx)
 
 		if (!si_update_gs_ring_buffers(sctx))
 			return false;
-
-		si_update_gsvs_ring_bindings(sctx);
 	} else {
 		si_pm4_bind_state(sctx, gs, NULL);
 		si_pm4_bind_state(sctx, es, NULL);