diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-08-26 22:38:35 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-08-30 19:43:56 +0200 |
| commit | 78354011f99c4103345f8f32e10b0b4b884ebdaf (patch) | |
| tree | 0686495ce07db652b88bed43a4f421e4077d5545 /src/gallium/drivers/r600/r600_resource.h | |
| parent | 863e2c85b9c59d717ad786c709638d948ff0f38e (diff) | |
| download | external_mesa3d-78354011f99c4103345f8f32e10b0b4b884ebdaf.zip external_mesa3d-78354011f99c4103345f8f32e10b0b4b884ebdaf.tar.gz external_mesa3d-78354011f99c4103345f8f32e10b0b4b884ebdaf.tar.bz2 | |
r600g: implement color resolve for r600
The blend state is different and the resolve single-sample buffer must have
FMASK and CMASK enabled. I decided to have one CMASK and one FMASK
per context instead of per resource.
There are new FMASK and CMASK allocation helpers and a new buffer_create
helper for that.
Diffstat (limited to 'src/gallium/drivers/r600/r600_resource.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_resource.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h index da60d37..a5a5404 100644 --- a/src/gallium/drivers/r600/r600_resource.h +++ b/src/gallium/drivers/r600/r600_resource.h @@ -64,6 +64,18 @@ struct r600_texture { #define R600_TEX_IS_TILED(tex, level) ((tex)->array_mode[level] != V_038000_ARRAY_LINEAR_GENERAL && (tex)->array_mode[level] != V_038000_ARRAY_LINEAR_ALIGNED) +struct r600_fmask_info { + unsigned size; + unsigned alignment; + unsigned bank_height; +}; + +struct r600_cmask_info { + unsigned size; + unsigned alignment; + unsigned slice_tile_max; +}; + struct r600_surface { struct pipe_surface base; @@ -88,6 +100,8 @@ struct r600_surface { unsigned cb_color_cmask; /* CB_COLORn_CMASK (EG) or CB_COLORn_TILE (r600) */ unsigned cb_color_cmask_slice; /* EG only */ unsigned cb_color_mask; /* R600 only */ + struct r600_resource *cb_buffer_fmask; /* Used for FMASK relocations. R600 only */ + struct r600_resource *cb_buffer_cmask; /* Used for CMASK relocations. R600 only */ /* DB registers. */ unsigned db_depth_info; /* DB_Z_INFO (EG) or DB_DEPTH_INFO (r600) */ @@ -104,6 +118,13 @@ void r600_resource_destroy(struct pipe_screen *screen, struct pipe_resource *res void r600_init_screen_resource_functions(struct pipe_screen *screen); /* r600_texture */ +void r600_texture_get_fmask_info(struct r600_screen *rscreen, + struct r600_texture *rtex, + unsigned nr_samples, + struct r600_fmask_info *out); +void r600_texture_get_cmask_info(struct r600_screen *rscreen, + struct r600_texture *rtex, + struct r600_cmask_info *out); struct pipe_resource *r600_texture_create(struct pipe_screen *screen, const struct pipe_resource *templ); struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen, |