fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/wsi: Drop wsi_common_get_current_time()

Browse source 
Use os_time_get_nano() instead.  At this point, it's just a wrapper
around os_time_get_nano() anyway.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13427>
This commit is contained in:
Jason Ekstrand 2021-10-21 10:52:29 -05:00
parent 7b19c9d19b
commit 2bd3434fa2
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vulkan/wsi/wsi_common.c
View file

@ -25,7 +25,6 @@
#include "wsi_common_entrypoints.h"
#include "util/macros.h"
#include "util/os_file.h"
#include "util/os_time.h"
#include "util/xmlconfig.h"
#include "vk_device.h"
#include "vk_instance.h"
@ -802,12 +801,6 @@ wsi_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo)
pPresentInfo);
}
uint64_t
wsi_common_get_current_time(void)
{
return os_time_get_nano();
}
VKAPI_ATTR VkResult VKAPI_CALL
wsi_GetDeviceGroupPresentCapabilitiesKHR(VkDevice device,
VkDeviceGroupPresentCapabilitiesKHR *pCapabilities)

3
src/vulkan/wsi/wsi_common.h
View file

@ -273,7 +273,4 @@ wsi_common_queue_present(const struct wsi_device *wsi,
int queue_family_index,
const VkPresentInfoKHR *pPresentInfo);
uint64_t
wsi_common_get_current_time(void);
#endif

9
src/vulkan/wsi/wsi_common_display.c
View file

@ -43,6 +43,7 @@
#endif
#include "util/hash_table.h"
#include "util/list.h"
#include "util/os_time.h"
#include "vk_device.h"
#include "vk_instance.h"
@ -190,7 +191,7 @@ wsi_display_mode_refresh(struct wsi_display_mode *wsi)
static uint64_t wsi_rel_to_abs_time(uint64_t rel_time)
{
uint64_t current_time = wsi_common_get_current_time();
uint64_t current_time = os_time_get_nano();
/* check for overflow */
if (rel_time > UINT64_MAX - current_time)
@ -1517,8 +1518,8 @@ wsi_display_fence_wait(struct wsi_fence *fence_wsi, uint64_t timeout)
wsi_display_debug("%9lu wait fence %lu %ld\n",
pthread_self(), fence->sequence,
(int64_t) (timeout - wsi_common_get_current_time()));
wsi_display_debug_code(uint64_t start_ns = wsi_common_get_current_time());
(int64_t) (timeout - os_time_get_nano()));
wsi_display_debug_code(uint64_t start_ns = os_time_get_nano());
pthread_mutex_lock(&wsi->wait_mutex);
VkResult result;
@ -1553,7 +1554,7 @@ wsi_display_fence_wait(struct wsi_fence *fence_wsi, uint64_t timeout)
pthread_mutex_unlock(&wsi->wait_mutex);
wsi_display_debug("%9lu fence wait %f ms\n",
pthread_self(),
((int64_t) (wsi_common_get_current_time() - start_ns)) /
((int64_t) (os_time_get_nano() - start_ns)) /
1.0e6);
return result;
}

5
src/vulkan/wsi/wsi_common_x11.c
View file

@ -39,6 +39,7 @@
#include <xf86drm.h>
#include "drm-uapi/drm_fourcc.h"
#include "util/hash_table.h"
#include "util/os_time.h"
#include "util/u_debug.h"
#include "util/u_thread.h"
#include "util/xmlconfig.h"
@ -1050,7 +1051,7 @@ x11_handle_dri3_present_event(struct x11_swapchain *chain,
static uint64_t wsi_get_absolute_timeout(uint64_t timeout)
{
uint64_t current_time = wsi_common_get_current_time();
uint64_t current_time = os_time_get_nano();
timeout = MIN2(UINT64_MAX - current_time, timeout);
@ -1101,7 +1102,7 @@ x11_acquire_next_image_poll_x11(struct x11_swapchain *chain,
/* If a non-special event happens, the fd will still
* poll. So recalculate the timeout now just in case.
*/
uint64_t current_time = wsi_common_get_current_time();
uint64_t current_time = os_time_get_nano();
if (atimeout > current_time)
timeout = atimeout - current_time;
else