diff --git a/src/vulkan/runtime/vk_sync_timeline.h b/src/vulkan/runtime/vk_sync_timeline.h index d1fcf8c12ea..5604b9cfcfc 100644 --- a/src/vulkan/runtime/vk_sync_timeline.h +++ b/src/vulkan/runtime/vk_sync_timeline.h @@ -24,6 +24,7 @@ #define VK_SYNC_TIMELINE_H #include "c11/threads.h" +#include "util/cnd_monotonic.h" #include "util/list.h" #include "util/macros.h" diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index 864edeb390d..c06d4f7ffa2 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -397,32 +397,6 @@ configure_image(const struct wsi_swapchain *chain, } } -#if defined(HAVE_PTHREAD) && !defined(_WIN32) -bool -wsi_init_pthread_cond_monotonic(pthread_cond_t *cond) -{ - pthread_condattr_t condattr; - bool ret = false; - - if (pthread_condattr_init(&condattr) != 0) - goto fail_attr_init; - - if (pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC) != 0) - goto fail_attr_set; - - if (pthread_cond_init(cond, &condattr) != 0) - goto fail_cond_init; - - ret = true; - -fail_cond_init: -fail_attr_set: - pthread_condattr_destroy(&condattr); -fail_attr_init: - return ret; -} -#endif - VkResult wsi_swapchain_init(const struct wsi_device *wsi, struct wsi_swapchain *chain, diff --git a/src/vulkan/wsi/wsi_common_private.h b/src/vulkan/wsi/wsi_common_private.h index 7767f7b8431..ff17db5e778 100644 --- a/src/vulkan/wsi/wsi_common_private.h +++ b/src/vulkan/wsi/wsi_common_private.h @@ -441,11 +441,6 @@ void wsi_headless_finish_wsi(struct wsi_device *wsi_device, VK_DEFINE_NONDISP_HANDLE_CASTS(wsi_swapchain, base, VkSwapchainKHR, VK_OBJECT_TYPE_SWAPCHAIN_KHR) -#if defined(HAVE_PTHREAD) && !defined(_WIN32) -bool -wsi_init_pthread_cond_monotonic(pthread_cond_t *cond); -#endif - #ifdef __cplusplus } #endif