Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1147390. Enable / disable vsync on the vsync thread only. r=kats

Browse Source
This commit is contained in:
Mason Chang 2015-04-10 07:59:21 -07:00
parent 057facc415
commit 97dd056cfa
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gfx/thebes/SoftwareVsyncSource.cpp
View File

@ -17,14 +17,13 @@ SoftwareVsyncSource::SoftwareVsyncSource()
SoftwareVsyncSource::~SoftwareVsyncSource()
{
MOZ_ASSERT(NS_IsMainThread());
// Ensure we disable vsync on the main thread here
mGlobalDisplay->DisableVsync();
mGlobalDisplay->Shutdown();
mGlobalDisplay = nullptr;
}
SoftwareDisplay::SoftwareDisplay()
: mVsyncEnabled(false)
, mCurrentTaskMonitor("SoftwareVsyncCurrentTaskMonitor")
: mCurrentVsyncTask(nullptr)
, mVsyncEnabled(false)
{
// Mimic 60 fps
MOZ_ASSERT(NS_IsMainThread());
@ -34,41 +33,46 @@ SoftwareDisplay::SoftwareDisplay()
MOZ_RELEASE_ASSERT(mVsyncThread->Start(), "Could not start software vsync thread");
}
SoftwareDisplay::~SoftwareDisplay() {}
void
SoftwareDisplay::EnableVsync()
{
MOZ_ASSERT(NS_IsMainThread());
if (IsVsyncEnabled()) {
MOZ_ASSERT(mVsyncThread->IsRunning());
if (NS_IsMainThread()) {
if (mVsyncEnabled) {
return;
}
mVsyncEnabled = true;
mVsyncThread->message_loop()->PostTask(FROM_HERE,
NewRunnableMethod(this, &SoftwareDisplay::EnableVsync));
return;
}
{ // scope lock
mozilla::MonitorAutoLock lock(mCurrentTaskMonitor);
mVsyncEnabled = true;
MOZ_ASSERT(mVsyncThread->IsRunning());
mCurrentVsyncTask = NewRunnableMethod(this,
&SoftwareDisplay::NotifyVsync,
mozilla::TimeStamp::Now());
mVsyncThread->message_loop()->PostTask(FROM_HERE, mCurrentVsyncTask);
}
MOZ_ASSERT(IsInSoftwareVsyncThread());
NotifyVsync(mozilla::TimeStamp::Now());
}
void
SoftwareDisplay::DisableVsync()
{
MOZ_ASSERT(NS_IsMainThread());
if (!IsVsyncEnabled()) {
MOZ_ASSERT(mVsyncThread->IsRunning());
if (NS_IsMainThread()) {
if (!mVsyncEnabled) {
return;
}
mVsyncEnabled = false;
mVsyncThread->message_loop()->PostTask(FROM_HERE,
NewRunnableMethod(this, &SoftwareDisplay::DisableVsync));
return;
}
MOZ_ASSERT(mVsyncThread->IsRunning());
{ // scope lock
mozilla::MonitorAutoLock lock(mCurrentTaskMonitor);
mVsyncEnabled = false;
if (mCurrentVsyncTask) {
mCurrentVsyncTask->Cancel();
mCurrentVsyncTask = nullptr;
}
MOZ_ASSERT(IsInSoftwareVsyncThread());
if (mCurrentVsyncTask) {
mCurrentVsyncTask->Cancel();
mCurrentVsyncTask = nullptr;
}
}
@ -76,7 +80,6 @@ bool
SoftwareDisplay::IsVsyncEnabled()
{
MOZ_ASSERT(NS_IsMainThread());
mozilla::MonitorAutoLock lock(mCurrentTaskMonitor);
return mVsyncEnabled;
}
@ -118,12 +121,6 @@ SoftwareDisplay::ScheduleNextVsync(mozilla::TimeStamp aVsyncTimestamp)
delay = mozilla::TimeDuration::FromMilliseconds(0);
}
mozilla::MonitorAutoLock lock(mCurrentTaskMonitor);
// We could've disabled vsync between this posted task and when it actually
// executes
if (!mVsyncEnabled) {
return;
}
mCurrentVsyncTask = NewRunnableMethod(this,
&SoftwareDisplay::NotifyVsync,
nextVsync);
@ -133,9 +130,11 @@ SoftwareDisplay::ScheduleNextVsync(mozilla::TimeStamp aVsyncTimestamp)
delay.ToMilliseconds());
}
SoftwareDisplay::~SoftwareDisplay()
void
SoftwareDisplay::Shutdown()
{
MOZ_ASSERT(NS_IsMainThread());
DisableVsync();
mVsyncThread->Stop();
delete mVsyncThread;
}

7
gfx/thebes/SoftwareVsyncSource.h
View File

@ -28,6 +28,7 @@ public:
bool IsInSoftwareVsyncThread();
virtual void NotifyVsync(mozilla::TimeStamp aVsyncTimestamp) override;
void ScheduleNextVsync(mozilla::TimeStamp aVsyncTimestamp);
void Shutdown();
protected:
~SoftwareDisplay();
@ -36,10 +37,8 @@ private:
mozilla::TimeDuration mVsyncRate;
// Use a chromium thread because nsITimers* fire on the main thread
base::Thread* mVsyncThread;
bool mVsyncEnabled;
CancelableTask* mCurrentVsyncTask;
// Locks against both mCurrentVsyncTask and mVsyncEnabled
mozilla::Monitor mCurrentTaskMonitor;
CancelableTask* mCurrentVsyncTask; // only access on vsync thread
bool mVsyncEnabled; // Only access on main thread
}; // SoftwareDisplay
// Fallback option to use a software timer to mimic vsync. Useful for gtests