diff options
| author | Marek Olšák <[email protected]> | 2016-08-11 22:00:49 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-08-17 12:24:35 +0200 |
| commit | 95020c6dfd74d0ce35c0f0ce89f313ad266ba721 (patch) | |
| tree | 4c2a6bcdda58095ac93dcfaff735e6b260aec058 /src/gallium/drivers/radeonsi | |
| parent | e2bb24f213bfdb4c51470926d9668181f09c5816 (diff) | |
gallium/radeon: mark shader rings as highest-priority buffers
and rename the enum
Acked-by: Edward O'Callaghan <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_debug.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index ae11b2c7519..be300ac5b18 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -561,7 +561,6 @@ static const char *priority_to_string(enum radeon_bo_priority priority) ITEM(SAMPLER_BUFFER), ITEM(VERTEX_BUFFER), ITEM(SHADER_RW_BUFFER), - ITEM(RINGS_STREAMOUT), ITEM(SCRATCH_BUFFER), ITEM(COMPUTE_GLOBAL), ITEM(SAMPLER_TEXTURE), @@ -574,6 +573,7 @@ static const char *priority_to_string(enum radeon_bo_priority priority) ITEM(CMASK), ITEM(DCC), ITEM(HTILE), + ITEM(SHADER_RINGS), }; #undef ITEM diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index fcc8a3282bd..f03a8958d15 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -1772,7 +1772,7 @@ void si_init_all_descriptors(struct si_context *sctx) si_init_buffer_resources(&sctx->rw_buffers, &sctx->descriptors[SI_DESCS_RW_BUFFERS], SI_NUM_RW_BUFFERS, SI_SGPR_RW_BUFFERS, - RADEON_USAGE_READWRITE, RADEON_PRIO_RINGS_STREAMOUT, + RADEON_USAGE_READWRITE, RADEON_PRIO_SHADER_RINGS, &ce_offset); si_init_descriptors(&sctx->vertex_buffers, SI_SGPR_VERTEX_BUFFERS, 4, SI_NUM_VERTEX_BUFFERS, NULL, NULL); |