From: Emil Velikov Date: Sat, 28 May 2016 18:49:37 +0000 (+0100) Subject: anv: resolve wayland-only build X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93e65fdcac10545504b588e24d3ef03fa3e9e424;p=mesa.git anv: resolve wayland-only build 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 Reported-by: Cedric Sodhi Signed-off-by: Emil Velikov Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index ce9ec32f3ec..006944a7e25 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