Mesa (staging/20.2): radv: Fix assert that is too strict.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: 5b25e9de0c6b310bc3073aa9eb6fdea5dea8c406
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b25e9de0c6b310bc3073aa9eb6fdea5dea8c406

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Fri Aug  7 20:29:07 2020 +0200

radv: Fix assert that is too strict.

The added assert fails on MSAA images if we disable FMASK ....

Reordered things.

Fixes: c6aadbae715 "radv: Don't use both DCC and CMASK for single sample images."
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3385
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6232>
(cherry picked from commit ff4f6202be26d1ffe1dfd306e6a586ea380367bc)

---

 .pick_status.json           | 2 +-
 src/amd/vulkan/radv_image.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f1e91c5652d..1d6c48692e1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -328,7 +328,7 @@
         "description": "radv: Fix assert that is too strict.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c6aadbae71562c14166a6e7942867eaf56b3e017"
     },
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 343a5d85a88..fc0fb81175e 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -1233,13 +1233,13 @@ static void
 radv_image_alloc_single_sample_cmask(const struct radv_image *image,
                                      struct radeon_surf *surf)
 {
-	assert(image->info.storage_samples == 1 || surf->cmask_offset);
-
 	if (!surf->cmask_size || surf->cmask_offset || surf->bpe > 8 ||
 	    image->info.levels > 1 || image->info.depth > 1 ||
 	    radv_image_has_dcc(image) || !radv_image_use_fast_clear_for_image(image))
 		return;
 
+	assert(image->info.storage_samples == 1);
+
 	surf->cmask_offset = align64(surf->total_size, surf->cmask_alignment);
 	surf->total_size = surf->cmask_offset + surf->cmask_size;
 	surf->alignment = MAX2(surf->alignment, surf->cmask_alignment);