Module: Mesa Branch: master Commit: 05e3ccd8a114df741ec493c977374deda3c6e693 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05e3ccd8a114df741ec493c977374deda3c6e693
Author: Eric Anholt <[email protected]> Date: Mon Dec 16 19:58:39 2019 -0800 vulkan/wsi: Fix compiler warning when no WSI platforms are enabled. Reviewed-by: Kristian H. Kristensen <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3539> --- src/vulkan/wsi/wsi_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index dfc90b5900d..0adf54eab8f 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -42,7 +42,7 @@ wsi_device_init(struct wsi_device *wsi, const struct driOptionCache *dri_options) { const char *present_mode; - VkResult result; + UNUSED VkResult result; memset(wsi, 0, sizeof(*wsi)); @@ -145,10 +145,13 @@ wsi_device_init(struct wsi_device *wsi, } return VK_SUCCESS; - +#if defined(VK_USE_PLATFORM_XCB_KHR) || \ + defined(VK_USE_PLATFORM_WAYLAND_KHR) || \ + defined(VK_USE_PLATFORM_DISPLAY_KHR) fail: wsi_device_finish(wsi, alloc); return result; +#endif } void _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
