diff options
| author | Marek Olšák <[email protected]> | 2013-08-06 21:30:59 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-08-17 01:48:25 +0200 |
| commit | 356c041167ac96131869622f2a41b3d5b3017f9a (patch) | |
| tree | 14e1d840d7d5560ff67187a3359b4ca0d199df91 /src/gallium/drivers/radeonsi/radeonsi_pipe.h | |
| parent | 4855acd461cc7a540a13da421b74be2198c9369f (diff) | |
radeonsi: port texture improvements from r600g
This started as an attempt to add support for MSAA texture transfers and
MSAA depth-stencil decompression for the DB->CB copy path.
It has gotten a bit out of control, but it's for the greater good.
Some changes do not make much sense, they are there just to make it look
like the other driver.
With a few cosmetic modifications, r600_texture.c can be shared with
a symlink.
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/radeonsi_pipe.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.h b/src/gallium/drivers/radeonsi/radeonsi_pipe.h index 27913ed47c4..e1c6f30b3d7 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h @@ -138,9 +138,9 @@ struct r600_context { struct blitter_context *blitter; enum radeon_family family; enum chip_class chip_class; - void *custom_dsa_flush_depth_stencil; - void *custom_dsa_flush_depth; - void *custom_dsa_flush_stencil; + void *custom_dsa_flush_depth_stencil[8]; + void *custom_dsa_flush_depth[8]; + void *custom_dsa_flush_stencil[8]; void *custom_dsa_flush_inplace; void *custom_blend_resolve; void *custom_blend_decompress; @@ -227,11 +227,12 @@ struct r600_context { /* r600_blit.c */ void si_init_blit_functions(struct r600_context *rctx); -void si_blit_uncompress_depth(struct pipe_context *ctx, +void r600_blit_decompress_depth(struct pipe_context *ctx, struct r600_texture *texture, struct r600_texture *staging, unsigned first_level, unsigned last_level, - unsigned first_layer, unsigned last_layer); + unsigned first_layer, unsigned last_layer, + unsigned first_sample, unsigned last_sample); void si_flush_depth_textures(struct r600_context *rctx, struct r600_textures_info *textures); void r600_decompress_color_textures(struct r600_context *rctx, |