diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-04-19 02:14:53 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-04-22 01:14:14 +0200 |
| commit | 0954d5e9827baba4972e92a1f760cd891c9c0798 (patch) | |
| tree | e6976c497cf99ae03b761da0aebf7accd2e71d7d /src/gallium/drivers/radeonsi/si_state.h | |
| parent | 3138a28ff2a6a7c9bbf315538412f84b549d694a (diff) | |
| download | external_mesa3d-0954d5e9827baba4972e92a1f760cd891c9c0798.zip external_mesa3d-0954d5e9827baba4972e92a1f760cd891c9c0798.tar.gz external_mesa3d-0954d5e9827baba4972e92a1f760cd891c9c0798.tar.bz2 | |
radeonsi: clean up shader resource limit definitions
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 80a5983..5e5271f 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -32,7 +32,13 @@ #define SI_NUM_GRAPHICS_SHADERS (PIPE_SHADER_TESS_EVAL+1) #define SI_NUM_SHADERS (PIPE_SHADER_COMPUTE+1) -#define SI_MAX_ATTRIBS 16 + +#define SI_MAX_ATTRIBS 16 +#define SI_NUM_VERTEX_BUFFERS SI_MAX_ATTRIBS +#define SI_NUM_SAMPLERS 32 /* OpenGL textures units per shader */ +#define SI_NUM_CONST_BUFFERS 16 +#define SI_NUM_IMAGES 16 +#define SI_NUM_SHADER_BUFFERS 16 struct si_screen; struct si_shader; @@ -146,20 +152,6 @@ struct si_shader_data { uint32_t sh_base[SI_NUM_SHADERS]; }; -#define SI_NUM_USER_SAMPLERS 32 /* AKA OpenGL textures units per shader */ -#define SI_NUM_SAMPLERS SI_NUM_USER_SAMPLERS - -/* 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) - -#define SI_NUM_IMAGES 16 - -#define SI_NUM_SHADER_BUFFERS 16 - /* Private read-write buffer slots. */ enum { SI_HS_RING_TESS_FACTOR, @@ -186,9 +178,6 @@ enum { SI_NUM_RW_BUFFERS, }; -#define SI_NUM_VERTEX_BUFFERS SI_MAX_ATTRIBS - - /* This represents descriptors in memory, such as buffer resources, * image resources, and sampler states. */ |