Mesa (master): radv: Rely on ac_surface for avoiding cmask for linear images.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ffae3589c986574083fbd20341e6a0abe77b0741
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ffae3589c986574083fbd20341e6a0abe77b0741

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sun May 24 13:25:53 2020 +0200

radv: Rely on ac_surface for avoiding cmask for linear images.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5194>

---

 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