fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Fix assert that is too strict.

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

Reordered things.

Fixes: c6aadbae71 "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>
(cherry picked from commit ff4f6202be)
This commit is contained in:
Bas Nieuwenhuizen 2020-08-07 20:29:07 +02:00 • committed by Dylan Baker
parent c09c88fbac
commit 5b25e9de0c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

4
src/amd/vulkan/radv_image.c
View file

@ -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);