diff options
| author | Marek Olšák <[email protected]> | 2013-04-11 14:54:40 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-05-15 20:19:45 +0200 |
| commit | 61c995bc47b838317a4a62fba2ff2031bcb0c23e (patch) | |
| tree | ce944ced016e5fbca14b36dcaf225efc3f758ad3 /src/gallium/drivers/r600/r600_resource.h | |
| parent | 61506257f68c18cc927a44f25344ee0584fdbd0e (diff) | |
r600g: rewrite FMASK allocation, fix FMASK texturing with 2 and 4 samples
This fixes and enables texturing with compressed MSAA colorbuffers
on Evergreen and Cayman. For the first time, multisample textures work
on Cayman.
This requires the libdrm flag RADEON_SURF_FMASK.
v2: require libdrm_radeon 2.4.45
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_resource.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_resource.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h index e20e9421205..d5df63396cc 100644 --- a/src/gallium/drivers/r600/r600_resource.h +++ b/src/gallium/drivers/r600/r600_resource.h @@ -84,7 +84,9 @@ struct r600_texture { /* FMASK and CMASK can only be used with MSAA textures for now. * MSAA textures cannot have mipmaps. */ unsigned fmask_offset, fmask_size, fmask_bank_height; - unsigned cmask_offset, cmask_size, cmask_slice_tile_max; + unsigned fmask_slice_tile_max; + unsigned cmask_offset, cmask_size; + unsigned cmask_slice_tile_max; struct r600_resource *htile; /* use htile only for first level */ @@ -97,6 +99,7 @@ struct r600_fmask_info { unsigned size; unsigned alignment; unsigned bank_height; + unsigned slice_tile_max; }; struct r600_cmask_info { |