diff options
| author | Dave Airlie <[email protected]> | 2012-11-03 20:53:33 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-11-10 06:20:46 +1000 |
| commit | eb44c36df842af010269eda1be77c4aea8ebe736 (patch) | |
| tree | 33fa9c3c55a6e29f6d05c464fad5bc69b5d34278 /src/gallium/drivers/r600/r600_pipe.h | |
| parent | e9cf40142d43e8a757cf6485329882c7e1c3a1d3 (diff) | |
r600g: add initial cube map array support (v2)
This contains the evergreen support.
Support is possible on rv670 upwards and the code in here
should work, but it doesn't and I haven't debugged it to
figure out why.
Beyond just adding support for the cube map array sampling,
r600 resinfo isn't conformant with the GL specification,
which states the number of layers should be returned for
the textureSize, so we have to track in an external
constant buffer the layers for each sampler if we need
them in the shader.
v2: only update the sampler constants if the sampler views have changed,
as suggested by Marek.
Reviewed-by: Marek Olšák <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 2287d6371ff..33ccefa13ca 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -37,11 +37,12 @@ #define R600_NUM_ATOMS 36 #define R600_MAX_USER_CONST_BUFFERS 1 -#define R600_MAX_DRIVER_CONST_BUFFERS 1 +#define R600_MAX_DRIVER_CONST_BUFFERS 2 #define R600_MAX_CONST_BUFFERS (R600_MAX_USER_CONST_BUFFERS + R600_MAX_DRIVER_CONST_BUFFERS) /* start driver buffers after user buffers */ #define R600_UCP_CONST_BUFFER (R600_MAX_USER_CONST_BUFFERS) +#define R600_TXQ_CONST_BUFFER (R600_MAX_USER_CONST_BUFFERS + 1) #define R600_MAX_CONST_BUFFER_SIZE 4096 @@ -311,6 +312,7 @@ struct r600_samplerview_state { uint32_t dirty_mask; uint32_t compressed_depthtex_mask; /* which textures are depth */ uint32_t compressed_colortex_mask; + boolean dirty_txq_constants; }; struct r600_sampler_states { @@ -325,6 +327,9 @@ struct r600_textures_info { struct r600_samplerview_state views; struct r600_sampler_states states; bool is_array_sampler[NUM_TEX_UNITS]; + + /* cube array txq workaround */ + uint32_t *txq_constants; }; struct r600_fence { |