fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into d3d12

Browse Source
This commit is contained in:
Triang3l
2019-04-05 13:33:11 +03:00
parent d623589c1c 84b8b444cf
commit 9a1008dacb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/base/clock.h
View File

@@ -23,7 +23,7 @@ class Clock {
// Host time, in FILETIME format. // Host time, in FILETIME format.
static uint64_t QueryHostSystemTime(); static uint64_t QueryHostSystemTime();
// Queries the milliseconds since the host began. // Queries the milliseconds since the host began.
static uint32_t QueryHostUptimeMillis(); static uint64_t QueryHostUptimeMillis();
// Guest time scalar. // Guest time scalar.
static double guest_time_scalar(); static double guest_time_scalar();

4
src/xenia/base/clock_posix.cc
View File

@@ -39,8 +39,8 @@ uint64_t Clock::QueryHostSystemTime() {
return ret; return ret;
} }
uint32_t Clock::QueryHostUptimeMillis() { uint64_t Clock::QueryHostUptimeMillis() {
return uint32_t(QueryHostTickCount() / (host_tick_frequency() / 1000)); return QueryHostTickCount() / (host_tick_frequency() / 1000);
} }
} // namespace xe } // namespace xe

4
src/xenia/base/clock_win.cc
View File

@@ -36,8 +36,8 @@ uint64_t Clock::QueryHostSystemTime() {
return (uint64_t(t.dwHighDateTime) << 32) | t.dwLowDateTime; return (uint64_t(t.dwHighDateTime) << 32) | t.dwLowDateTime;
} }
uint32_t Clock::QueryHostUptimeMillis() { uint64_t Clock::QueryHostUptimeMillis() {
return uint32_t(QueryHostTickCount() / (host_tick_frequency() / 1000)); return QueryHostTickCount() / (host_tick_frequency() / 1000);
} }
} // namespace xe } // namespace xe