diff options
| author | Marek Olšák <[email protected]> | 2015-08-28 22:33:02 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-09-01 21:51:13 +0200 |
| commit | 02c8e06497c14bed37dc1780585348bb2675cab6 (patch) | |
| tree | f52d81da0b1f27ae59fc1029a3f7a4f2facdc912 /src/gallium/drivers/radeonsi | |
| parent | 05af645a951fd985d0dbe3c22614e1dee8dfb3f0 (diff) | |
radeonsi: add SI_MAX_ATTRIBS
PIPE_MAX_ATTRIBS is 32, but we currently only support 16.
Reviewed-by: Alex Deucher <[email protected]>
Acked-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index b3a18267af1..62eda97dc7e 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2784,7 +2784,7 @@ static void *si_create_vertex_elements(struct pipe_context *ctx, struct si_vertex_element *v = CALLOC_STRUCT(si_vertex_element); int i; - assert(count < PIPE_MAX_ATTRIBS); + assert(count < SI_MAX_ATTRIBS); if (!v) return NULL; diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 242db8afd45..bf713c42e86 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -31,6 +31,7 @@ #include "radeon/r600_pipe_common.h" #define SI_NUM_SHADERS (PIPE_SHADER_TESS_EVAL+1) +#define SI_MAX_ATTRIBS 16 struct si_screen; struct si_shader; @@ -84,9 +85,9 @@ struct si_state_dsa { struct si_vertex_element { unsigned count; - uint32_t rsrc_word3[PIPE_MAX_ATTRIBS]; - uint32_t format_size[PIPE_MAX_ATTRIBS]; - struct pipe_vertex_element elements[PIPE_MAX_ATTRIBS]; + uint32_t rsrc_word3[SI_MAX_ATTRIBS]; + uint32_t format_size[SI_MAX_ATTRIBS]; + struct pipe_vertex_element elements[SI_MAX_ATTRIBS]; }; union si_state { @@ -156,7 +157,7 @@ struct si_shader_data { #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 +#define SI_NUM_VERTEX_BUFFERS SI_MAX_ATTRIBS /* This represents descriptors in memory, such as buffer resources, |