From: Simon Ser <contact@emersion.fr>
Date: Fri, 4 Feb 2022 11:17:54 +0000 (+0100)
Subject: vulkan/wsi/wayland: ensure added formats have flags
X-Git-Tag: upstream/22.3.5~12645
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffdac8bfa78303abc2be5242f50e229ae20042d7;p=platform%2Fupstream%2Fmesa.git

vulkan/wsi/wayland: ensure added formats have flags

A format needs to be either alpha or opaque, but can't be neither.

Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14874>
---

diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index 84355b0..e0af607 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -108,6 +108,8 @@ wsi_wl_display_add_vk_format(struct wsi_wl_display *display,
                              struct u_vector *formats,
                              VkFormat format, uint32_t flags)
 {
+   assert(flags & (WSI_WL_FMT_ALPHA | WSI_WL_FMT_OPAQUE));
+
    /* Don't add a format that's already in the list */
    struct wsi_wl_format *f = find_format(formats, format);
    if (f) {