[Mesa-dev] [PATCH 1/3] anv: resolve wayland-only build

Emil Velikov emil.l.velikov at gmail.com
Sun May 29 16:40:48 UTC 2016


From: Emil Velikov <emil.velikov at collabora.com>

Ensure that the final X11/XCB hunk is guarded by the correct macro.
Otherwise we'll require the symbol even when building without said
platform.

Cc: Cedric Sodhi <manday at openmail.cc>
Reported-by: Cedric Sodhi <manday at openmail.cc>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/intel/vulkan/anv_wsi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
index ce9ec32..006944a 100644
--- a/src/intel/vulkan/anv_wsi.c
+++ b/src/intel/vulkan/anv_wsi.c
@@ -39,7 +39,9 @@ anv_init_wsi(struct anv_physical_device *physical_device)
 #ifdef VK_USE_PLATFORM_WAYLAND_KHR
    result = anv_wl_init_wsi(physical_device);
    if (result != VK_SUCCESS) {
+#ifdef VK_USE_PLATFORM_XCB_KHR
       anv_x11_finish_wsi(physical_device);
+#endif
       return result;
    }
 #endif
-- 
2.8.2



More information about the mesa-dev mailing list