Mesa (master): radv: Fix assert.

[GitLab Mirror]

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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Tue Feb  2 13:15:20 2021 +0100

radv: Fix assert.

Fixes: 7f7da82dbb7 ("radv: Add image layout with drm format modifiers.")
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8828>

---

 src/amd/vulkan/radv_image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 6a0c66795a3..0bed9434e71 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -1436,8 +1436,8 @@ radv_image_create_layout(struct radv_device *device,
 	radv_image_alloc_values(device, image);
 
 	assert(image->planes[0].surface.surf_size);
-	assert(ac_modifier_has_dcc(image->planes[0].surface.modifier) ==
-	       radv_image_has_dcc(image));
+	assert(image->planes[0].surface.modifier == DRM_FORMAT_MOD_INVALID ||
+	       ac_modifier_has_dcc(image->planes[0].surface.modifier) == radv_image_has_dcc(image));
 	return VK_SUCCESS;
 }