Merge commit '28d94e8b86cef2f86bff054565179fc2027db8cd' into dev
This commit is contained in:
39
external/SDL/src/timer/windows/SDL_systimer.c
vendored
39
external/SDL/src/timer/windows/SDL_systimer.c
vendored
@@ -24,28 +24,53 @@
|
||||
|
||||
#include "../../core/windows/SDL_windows.h"
|
||||
|
||||
/* CREATE_WAITABLE_TIMER_HIGH_RESOLUTION flag was added in Windows 10 version 1803. */
|
||||
#ifndef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
|
||||
#define CREATE_WAITABLE_TIMER_HIGH_RESOLUTION 0x2
|
||||
#endif
|
||||
|
||||
typedef HANDLE (WINAPI *CreateWaitableTimerExW_t)(LPSECURITY_ATTRIBUTES lpTimerAttributes, LPCWSTR lpTimerName, DWORD dwFlags, DWORD dwDesiredAccess);
|
||||
static CreateWaitableTimerExW_t pCreateWaitableTimerExW;
|
||||
|
||||
typedef BOOL (WINAPI *SetWaitableTimerEx_t)(HANDLE hTimer, const LARGE_INTEGER *lpDueTime, LONG lPeriod, PTIMERAPCROUTINE pfnCompletionRoutine, LPVOID lpArgToCompletionRoutine, PREASON_CONTEXT WakeContext, ULONG TolerableDelay);
|
||||
static SetWaitableTimerEx_t pSetWaitableTimerEx;
|
||||
|
||||
static void SDL_CleanupWaitableHandle(void *handle)
|
||||
{
|
||||
CloseHandle(handle);
|
||||
}
|
||||
|
||||
#ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
|
||||
static HANDLE SDL_GetWaitableTimer(void)
|
||||
{
|
||||
static SDL_TLSID TLS_timer_handle;
|
||||
HANDLE timer;
|
||||
|
||||
if (!pCreateWaitableTimerExW || !pSetWaitableTimerEx) {
|
||||
static bool initialized;
|
||||
|
||||
if (!initialized) {
|
||||
HMODULE module = GetModuleHandle(TEXT("kernel32.dll"));
|
||||
if (module) {
|
||||
pCreateWaitableTimerExW = (CreateWaitableTimerExW_t)GetProcAddress(module, "CreateWaitableTimerExW");
|
||||
pSetWaitableTimerEx = (SetWaitableTimerEx_t)GetProcAddress(module, "SetWaitableTimerEx");
|
||||
}
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
if (!pCreateWaitableTimerExW || !pSetWaitableTimerEx) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
timer = SDL_GetTLS(&TLS_timer_handle);
|
||||
if (!timer) {
|
||||
timer = CreateWaitableTimerExW(NULL, NULL, CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS);
|
||||
timer = pCreateWaitableTimerExW(NULL, NULL, CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS);
|
||||
if (timer) {
|
||||
SDL_SetTLS(&TLS_timer_handle, timer, SDL_CleanupWaitableHandle);
|
||||
}
|
||||
}
|
||||
return timer;
|
||||
}
|
||||
#endif // CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
|
||||
|
||||
static HANDLE SDL_GetWaitableEvent(void)
|
||||
{
|
||||
@@ -80,21 +105,15 @@ Uint64 SDL_GetPerformanceFrequency(void)
|
||||
|
||||
void SDL_SYS_DelayNS(Uint64 ns)
|
||||
{
|
||||
/* CREATE_WAITABLE_TIMER_HIGH_RESOLUTION flag was added in Windows 10 version 1803.
|
||||
*
|
||||
* Use the compiler version to determine availability.
|
||||
*/
|
||||
#ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
|
||||
HANDLE timer = SDL_GetWaitableTimer();
|
||||
if (timer) {
|
||||
LARGE_INTEGER due_time;
|
||||
due_time.QuadPart = -((LONGLONG)ns / 100);
|
||||
if (SetWaitableTimerEx(timer, &due_time, 0, NULL, NULL, NULL, 0)) {
|
||||
if (pSetWaitableTimerEx(timer, &due_time, 0, NULL, NULL, NULL, 0)) {
|
||||
WaitForSingleObject(timer, INFINITE);
|
||||
}
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_MS;
|
||||
if (ns > max_delay) {
|
||||
|
||||
Reference in New Issue
Block a user