diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-04-18 22:16:54 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-04-22 01:14:13 +0200 |
| commit | 1378487fb4a0fe35779ead32b1ecd5467e3ba1c6 (patch) | |
| tree | cd3aa7ac8c2656f10f10de77fdad55116c80086d /src/gallium/drivers/radeonsi/si_descriptors.c | |
| parent | 4ff8cbb0d8c483cc91cad3494cd1db572dcd51ee (diff) | |
| download | external_mesa3d-1378487fb4a0fe35779ead32b1ecd5467e3ba1c6.zip external_mesa3d-1378487fb4a0fe35779ead32b1ecd5467e3ba1c6.tar.gz external_mesa3d-1378487fb4a0fe35779ead32b1ecd5467e3ba1c6.tar.bz2 | |
radeonsi: rename and rearrange RW buffer slots
- use an enum
- use a unique slot number regardless of the shader stage
(the per-stage slots will go away for RW buffers)
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_descriptors.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 2306a8b..425c6a0 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -1053,7 +1053,7 @@ static void si_set_streamout_targets(struct pipe_context *ctx, /* Set the shader resources.*/ for (i = 0; i < num_targets; i++) { - bufidx = SI_SO_BUF_OFFSET + i; + bufidx = SI_VS_STREAMOUT_BUF0 + i; if (targets[i]) { struct pipe_resource *buffer = targets[i]->buffer; @@ -1093,7 +1093,7 @@ static void si_set_streamout_targets(struct pipe_context *ctx, buffers->desc.dirty_mask |= 1llu << bufidx; } for (; i < old_num_targets; i++) { - bufidx = SI_SO_BUF_OFFSET + i; + bufidx = SI_VS_STREAMOUT_BUF0 + i; /* Clear the descriptor and unset the resource. */ memset(buffers->desc.list + bufidx*4, 0, sizeof(uint32_t) * 4); pipe_resource_reference(&buffers->buffers[bufidx], NULL); @@ -1220,7 +1220,7 @@ static void si_invalidate_buffer(struct pipe_context *ctx, struct pipe_resource rbuffer, buffers->shader_usage, buffers->priority); - if (i >= SI_SO_BUF_OFFSET && shader == PIPE_SHADER_VERTEX) { + if (i >= SI_VS_STREAMOUT_BUF0 && shader == PIPE_SHADER_VERTEX) { /* Update the streamout state. */ if (sctx->b.streamout.begin_emitted) { r600_emit_streamout_end(&sctx->b); |