From 6992f5419a57268b937e2dd0f9b9d543e60ed59c Mon Sep 17 00:00:00 2001 From: James Park Date: Thu, 3 Dec 2020 21:27:42 -0800 Subject: [PATCH] radv: Disable calibrated timestamps on Windows Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device.c | 2 ++ src/amd/vulkan/radv_extensions.py | 2 +- src/amd/vulkan/radv_private.h | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 4f3e57c884a..e23c2012a83 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -8168,6 +8168,7 @@ VkResult radv_GetPhysicalDeviceCalibrateableTimeDomainsEXT( return vk_outarray_status(&out); } +#ifndef _WIN32 static uint64_t radv_clock_gettime(clockid_t clock_id) { @@ -8275,6 +8276,7 @@ VkResult radv_GetCalibratedTimestampsEXT( return VK_SUCCESS; } +#endif void radv_GetPhysicalDeviceMultisamplePropertiesEXT( VkPhysicalDevice physicalDevice, diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 30e88c2dc74..16ccdee221e 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -121,7 +121,7 @@ EXTENSIONS = [ Extension('VK_EXT_4444_formats', 1, True), Extension('VK_EXT_acquire_xlib_display', 1, 'VK_USE_PLATFORM_XLIB_XRANDR_EXT'), Extension('VK_EXT_buffer_device_address', 2, True), - Extension('VK_EXT_calibrated_timestamps', 1, True), + Extension('VK_EXT_calibrated_timestamps', 1, 'RADV_SUPPORT_CALIBRATED_TIMESTAMPS'), Extension('VK_EXT_conditional_rendering', 2, True), Extension('VK_EXT_conservative_rasterization', 1, 'device->rad_info.chip_class >= GFX9'), Extension('VK_EXT_custom_border_color', 12, True), diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 9969b1d7938..93dbe82bc50 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -100,6 +100,12 @@ typedef uint32_t xcb_window_t; #define RADV_SUPPORT_ANDROID_HARDWARE_BUFFER 0 #endif +#ifdef _WIN32 +#define RADV_SUPPORT_CALIBRATED_TIMESTAMPS 0 +#else +#define RADV_SUPPORT_CALIBRATED_TIMESTAMPS 1 +#endif + #ifdef _WIN32 #define radv_printflike(a, b) #else