Module: Mesa Branch: staging/18.3 Commit: 422c905f4b6739e0913fe58fd987826b1fbd119e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=422c905f4b6739e0913fe58fd987826b1fbd119e
Author: Eric Engestrom <[email protected]> Date: Mon Nov 5 09:57:09 2018 +0000 wsi/wayland: only finish() a successfully init()ed display Fixes: 43691024982b3ea734ad0 "vulkan/wsi/wayland: Stop caching Wayland displays" Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dave Airlie <[email protected]> Reviewed-by: Philipp Zabel <[email protected]> (cherry picked from commit d515ded4d951b830b560c352d64918a89027bee5) --- src/vulkan/wsi/wsi_common_wayland.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 12014b0c14..3d3a60167b 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -456,7 +456,8 @@ wsi_wl_get_presentation_support(struct wsi_device *wsi_device, struct wsi_wl_display display; VkResult ret = wsi_wl_display_init(wsi, &display, wl_display, false); - wsi_wl_display_finish(&display); + if (ret == VK_SUCCESS) + wsi_wl_display_finish(&display); return ret == VK_SUCCESS; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
