Mesa (master): vulkan/wsi/wayland: fix ARGB window support

Dave Airlie airlied at kemper.freedesktop.org
Wed Oct 26 02:40:56 UTC 2016


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

Author: Fredrik Höglund <fredrik at kde.org>
Date:   Fri Oct 21 19:07:37 2016 +0200

vulkan/wsi/wayland: fix ARGB window support

Use an ARGB format for the DRM buffer when the compositeAlpha field
in VkSwapchainCreateInfoKHR is set to
VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR.

Cc: "13.0" <mesa-stable at lists.freedesktop.org>

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/vulkan/wsi/wsi_common_wayland.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index fc13bde..196ee28 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -702,6 +702,9 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
    if (chain == NULL)
       return VK_ERROR_OUT_OF_HOST_MEMORY;
 
+   bool alpha = pCreateInfo->compositeAlpha ==
+                      VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR;
+
    chain->base.device = device;
    chain->base.destroy = wsi_wl_swapchain_destroy;
    chain->base.get_images = wsi_wl_swapchain_get_images;
@@ -711,7 +714,7 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
    chain->surface = surface->surface;
    chain->extent = pCreateInfo->imageExtent;
    chain->vk_format = pCreateInfo->imageFormat;
-   chain->drm_format = wl_drm_format_for_vk_format(chain->vk_format, false);
+   chain->drm_format = wl_drm_format_for_vk_format(chain->vk_format, alpha);
 
    chain->present_mode = pCreateInfo->presentMode;
    chain->fifo_ready = true;




More information about the mesa-commit mailing list