From ff95aab0b9a7a416d362b3c79165e40064a423ac Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 13 Jul 2022 19:27:26 -0700
Subject: [PATCH] Revert "Qt: More Windows frame-pacing fixes"

This reverts commit 5b3fea303814b8dc311edeef795d8e44f9ded7dc.
---
 src/platform/qt/DisplayGL.cpp | 10 +++-------
 src/platform/qt/DisplayGL.h   |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/platform/qt/DisplayGL.cpp b/src/platform/qt/DisplayGL.cpp
index 6038b17da..4175505b5 100644
--- a/src/platform/qt/DisplayGL.cpp
+++ b/src/platform/qt/DisplayGL.cpp
@@ -644,9 +644,6 @@ void PainterGL::draw() {
 
 	if (!mCoreSyncWaitFrameStart(sync)) {
 		mCoreSyncWaitFrameEnd(sync);
-		if (m_timerResidue > targetNsec) {
-			m_timerResidue %= targetNsec;
-		}
 		if (!sync->audioWait && !sync->videoFrameWait) {
 			return;
 		}
@@ -658,13 +655,13 @@ void PainterGL::draw() {
 	dequeue();
 	bool forceRedraw = !m_videoProxy;
 	if (sync->audioWait || sync->videoFrameWait) {
-		while (delay + m_overage + m_delayTimer.nsecsElapsed() + OVERHEAD_NSEC < targetNsec) {
+		while (delay + m_delayTimer.nsecsElapsed() + OVERHEAD_NSEC < targetNsec) {
 			QThread::usleep(200);
 		}
 		forceRedraw = sync->videoFrameWait;
 	}
 	if (!forceRedraw) {
-		forceRedraw = delay + m_overage + m_delayTimer.nsecsElapsed() + OVERHEAD_NSEC >= refreshNsec;
+		forceRedraw = delay + m_delayTimer.nsecsElapsed() + OVERHEAD_NSEC >= refreshNsec;
 	}
 	mCoreSyncWaitFrameEnd(sync);
 
@@ -673,8 +670,7 @@ void PainterGL::draw() {
 		m_delayTimer.restart();
 
 		delay -= targetNsec;
-		m_overage = (m_overage + delay) / 2;
-		m_timerResidue = delay;
+		m_timerResidue = (m_timerResidue + delay) / 2;
 
 		if (m_timerResidue > refreshNsec) {
 			if (!m_drawTimer.isActive()) {
diff --git a/src/platform/qt/DisplayGL.h b/src/platform/qt/DisplayGL.h
index 4bd96be36..5b12feae0 100644
--- a/src/platform/qt/DisplayGL.h
+++ b/src/platform/qt/DisplayGL.h
@@ -196,7 +196,6 @@ private:
 	bool m_started = false;
 	QTimer m_drawTimer;
 	qint64 m_timerResidue;
-	qint64 m_overage;
 	std::shared_ptr<CoreController> m_context;
 	CoreController::Interrupter m_interrupter;
 	bool m_supportsShaders;