diff options
| author | Marek Olšák <[email protected]> | 2014-07-07 23:27:19 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-07-11 19:36:29 +0200 |
| commit | ee2a818d3306170ba18f44342aa759c2892a293f (patch) | |
| tree | fb35d4a8d58d55435814a731faae624740c022f4 /src/gallium/drivers/radeonsi/si_state.h | |
| parent | 4f3f0435bf8290a06fb6bb3ef17c7d1ed69d37d3 (diff) | |
radeonsi: rename definitions of shader limits
Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index c051d73aa42..fc3b1b97ea1 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -106,20 +106,35 @@ union si_state { struct si_pm4_state *array[0]; }; -#define NUM_TEX_UNITS 16 +#define SI_NUM_USER_SAMPLERS 16 /* AKA OpenGL textures units per shader */ /* User sampler views: 0..15 * FMASK sampler views: 16..31 (no sampler states) */ -#define FMASK_TEX_OFFSET NUM_TEX_UNITS -#define NUM_SAMPLER_VIEWS (FMASK_TEX_OFFSET+NUM_TEX_UNITS) -#define NUM_SAMPLER_STATES NUM_TEX_UNITS +#define SI_FMASK_TEX_OFFSET SI_NUM_USER_SAMPLERS +#define SI_NUM_SAMPLER_VIEWS (SI_FMASK_TEX_OFFSET + SI_NUM_USER_SAMPLERS) +#define SI_NUM_SAMPLER_STATES SI_NUM_USER_SAMPLERS -#define NUM_PIPE_CONST_BUFFERS 16 -#define NUM_CONST_BUFFERS (NUM_PIPE_CONST_BUFFERS + 1) +/* User constant buffers: 0..15 + * Driver state constants: 16 + */ +#define SI_NUM_USER_CONST_BUFFERS 16 +#define SI_DRIVER_STATE_CONST_BUF SI_NUM_USER_CONST_BUFFERS +#define SI_NUM_CONST_BUFFERS (SI_DRIVER_STATE_CONST_BUF + 1) +/* Read-write buffer slots. + * + * Ring buffers: 0..1 + * Streamout buffers: 2..5 + */ #define SI_RING_ESGS 0 #define SI_RING_GSVS 1 +#define SI_NUM_RING_BUFFERS 2 +#define SI_SO_BUF_OFFSET SI_NUM_RING_BUFFERS +#define SI_NUM_RW_BUFFERS (SI_SO_BUF_OFFSET + 4) + +#define SI_NUM_VERTEX_BUFFERS 16 + /* This represents resource descriptors in memory, such as buffer resources, * image resources, and sampler states. @@ -155,8 +170,8 @@ struct si_descriptors { struct si_sampler_views { struct si_descriptors desc; - struct pipe_sampler_view *views[NUM_SAMPLER_VIEWS]; - uint32_t *desc_data[NUM_SAMPLER_VIEWS]; + struct pipe_sampler_view *views[SI_NUM_SAMPLER_VIEWS]; + uint32_t *desc_data[SI_NUM_SAMPLER_VIEWS]; }; struct si_buffer_resources { |