diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2020-05-24 13:25:53 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-06-05 13:27:55 +0000 |
| commit | ffae3589c986574083fbd20341e6a0abe77b0741 (patch) | |
| tree | c0f373c4e468378e66992cb0f5d78984feb46c40 | |
| parent | b5488a863cf14f6f02b1aa4ec41fdbdd146492e5 (diff) | |
radv: Rely on ac_surface for avoiding cmask for linear images.
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5194>
| -rw-r--r-- | src/amd/common/ac_surface.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index b29bf552c9f..8203a7f0426 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -505,7 +505,7 @@ static void ac_compute_cmask(const struct radeon_info *info, unsigned num_pipes = info->num_tile_pipes; unsigned cl_width, cl_height; - if (surf->flags & RADEON_SURF_Z_OR_SBUFFER || + if (surf->flags & RADEON_SURF_Z_OR_SBUFFER || surf->is_linear || (config->info.samples >= 2 && !surf->fmask_size)) return; diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index b84f71b9a58..a4a622a0d81 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -1307,8 +1307,7 @@ radv_image_can_enable_cmask(struct radv_image *image) return radv_image_can_enable_dcc_or_cmask(image) && image->info.levels == 1 && - image->info.depth == 1 && - !image->planes[0].surface.is_linear; + image->info.depth == 1; } static inline bool |