From ffae3589c986574083fbd20341e6a0abe77b0741 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 24 May 2020 13:25:53 +0200 Subject: [PATCH] radv: Rely on ac_surface for avoiding cmask for linear images. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/common/ac_surface.c | 2 +- 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 -- 2.30.2