diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2014-01-28 15:39:30 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2014-01-29 11:09:26 +0900 |
| commit | f8e16010e51eef19ed7030ac7248438f729ae511 (patch) | |
| tree | 2674d7e39e78bcc5b6696105829c6bb84acc2d3e /src/gallium/drivers/radeonsi/si_pipe.h | |
| parent | d7c68e2dc1e08350ce5eb35bc0b20258a50f0dfb (diff) | |
| download | external_mesa3d-f8e16010e51eef19ed7030ac7248438f729ae511.zip external_mesa3d-f8e16010e51eef19ed7030ac7248438f729ae511.tar.gz external_mesa3d-f8e16010e51eef19ed7030ac7248438f729ae511.tar.bz2 | |
radeonsi: Put GS ring buffer descriptors with streamout buffer descriptors
And mark the constant buffers as read only for the GPU again.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_pipe.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index d63a52b..f97feb0 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -78,6 +78,8 @@ struct si_surface { #define SI_NUM_SHADERS (PIPE_SHADER_GEOMETRY+1) +#define SI_RW_SO 2 /* Streamout buffer descriptors after ring buffers */ + struct si_context { struct r600_common_context b; struct blitter_context *blitter; @@ -93,8 +95,8 @@ struct si_context { struct { /* The order matters. */ struct r600_atom *const_buffers[SI_NUM_SHADERS]; + struct r600_atom *rw_buffers[SI_NUM_SHADERS]; struct r600_atom *sampler_views[SI_NUM_SHADERS]; - struct r600_atom *streamout_buffers; /* Caches must be flushed after resource descriptors are * updated in memory. */ struct r600_atom *cache_flush; @@ -120,7 +122,7 @@ struct si_context { unsigned sprite_coord_enable; unsigned export_16bpc; struct si_buffer_resources const_buffers[SI_NUM_SHADERS]; - struct si_buffer_resources streamout_buffers; + struct si_buffer_resources rw_buffers[SI_NUM_SHADERS]; struct si_textures_info samplers[SI_NUM_SHADERS]; struct r600_resource *border_color_table; unsigned border_color_offset; |