diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2020-08-07 20:29:07 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-08-10 09:34:49 +0000 |
| commit | ff4f6202be26d1ffe1dfd306e6a586ea380367bc (patch) | |
| tree | 5f5435a16248ba6a5511ea13856302de8201bd6e | |
| parent | f7e7cf637e1b457d56b3aaf4d05c928ef9acff17 (diff) | |
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@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6232>
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |