wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 32db8dc79f00 (bug 1190257)

Browse Source
This commit is contained in:
Mason Chang 2015-08-12 10:15:54 -07:00
parent 88e110507d
commit a1f0389124
1 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -2502,7 +2502,6 @@ public:
public:
D3DVsyncDisplay()
: mVsyncEnabledLock("D3DVsyncEnabledLock")
, mPrevVsync(TimeStamp::Now())
, mVsyncEnabled(false)
{
mVsyncThread = new base::Thread("WindowsVsyncThread");
@ -2562,35 +2561,6 @@ public:
delay.ToMilliseconds());
}
TimeStamp GetAdjustedVsyncTimeStamp(LARGE_INTEGER& aFrequency,
QPC_TIME& aQpcVblankTime)
{
TimeStamp vsync = TimeStamp::Now();
LARGE_INTEGER qpcNow;
QueryPerformanceCounter(&qpcNow);
const int microseconds = 1000000;
int64_t adjust = qpcNow.QuadPart - aQpcVblankTime;
int64_t usAdjust = (adjust * microseconds) / aFrequency.QuadPart;
vsync -= TimeDuration::FromMicroseconds((double) usAdjust);
if (IsWin10OrLater()) {
// On Windows 10 and on, DWMGetCompositionTimingInfo
// reports the upcoming vsync time, which is in the future.
// Since large parts of Gecko assume TimeStamps can't be in future
// return the previous vsync.
MOZ_ASSERT(usAdjust <= 0);
TimeStamp currentVsync = mPrevVsync;
mPrevVsync = vsync;
return currentVsync;
}
// On Windows 7 and 8, DwmFlush wakes up AFTER qpcVBlankTime
// from DWMGetCompositionTimingInfo. We can return the adjusted vsync.
MOZ_ASSERT(usAdjust >= 0);
return vsync;
}
void VBlankLoop()
{
MOZ_ASSERT(IsInVsyncThread());
@ -2600,9 +2570,12 @@ public:
// Make sure to init the cbSize, otherwise GetCompositionTiming will fail
vblankTime.cbSize = sizeof(DWM_TIMING_INFO);
LARGE_INTEGER qpcNow;
LARGE_INTEGER frequency;
QueryPerformanceFrequency(&frequency);
TimeStamp vsync = TimeStamp::Now();
TimeStamp previousVsync = vsync;
const int microseconds = 1000000;
for (;;) {
{ // scope lock
@ -2610,9 +2583,12 @@ public:
if (!mVsyncEnabled) return;
}
// Large parts of gecko assume that the refresh driver timestamp
// must be <= Now() and cannot be in the future.
MOZ_ASSERT(vsync <= TimeStamp::Now());
if (previousVsync > vsync) {
vsync = TimeStamp::Now();
NS_WARNING("Previous vsync timestamp is ahead of the calculated vsync timestamp.");
}
previousVsync = vsync;
Display::NotifyVsync(vsync);
// DwmComposition can be dynamically enabled/disabled
@ -2630,7 +2606,13 @@ public:
HRESULT hr = WinUtils::dwmGetCompositionTimingInfoPtr(0, &vblankTime);
vsync = TimeStamp::Now();
if (SUCCEEDED(hr)) {
vsync = GetAdjustedVsyncTimeStamp(frequency, vblankTime.qpcVBlank);
QueryPerformanceCounter(&qpcNow);
// Adjust the timestamp to be the vsync timestamp since when
// DwmFlush wakes up and when the actual vsync occurred are not the
// same.
int64_t adjust = qpcNow.QuadPart - vblankTime.qpcVBlank;
int64_t usAdjust = (adjust * microseconds) / frequency.QuadPart;
vsync -= TimeDuration::FromMicroseconds((double) usAdjust);
}
} // end for
}
@ -2650,7 +2632,6 @@ public:
}
TimeDuration mSoftwareVsyncRate;
TimeStamp mPrevVsync;
Monitor mVsyncEnabledLock;
base::Thread* mVsyncThread;
bool mVsyncEnabled;