From 88b1fe0d97a6172b214d70f83dbae36e1bbcf985 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Tue, 29 Dec 2015 12:31:05 +0000
Subject: [PATCH] Better handling of OSX openGL buffer-swapping in occluded
 windows

---
 modules/juce_opengl/native/juce_OpenGL_osx.h | 57 ++++++++++----------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/modules/juce_opengl/native/juce_OpenGL_osx.h b/modules/juce_opengl/native/juce_OpenGL_osx.h
index 3468593f0f..aa2c71e038 100644
--- a/modules/juce_opengl/native/juce_OpenGL_osx.h
+++ b/modules/juce_opengl/native/juce_OpenGL_osx.h
@@ -157,9 +157,37 @@ public:
 
     void swapBuffers()
     {
+        double now = Time::getMillisecondCounterHiRes();
         [renderContext flushBuffer];
 
-        sleepIfRenderingTooFast();
+        if (minSwapTimeMs > 0)
+        {
+            // When our window is entirely occluded by other windows, flushBuffer
+            // fails to wait for the swap interval, so the render loop spins at full
+            // speed, burning CPU. This hack detects when things are going too fast
+            // and sleeps if necessary.
+
+            const double swapTime = Time::getMillisecondCounterHiRes() - now;
+            const int frameTime = (int) (now - lastSwapTime);
+
+            if (swapTime < 0.5 && frameTime < minSwapTimeMs - 3)
+            {
+                if (underrunCounter > 3)
+                {
+                    Thread::sleep (2 * (minSwapTimeMs - frameTime));
+                    now = Time::getMillisecondCounterHiRes();
+                }
+                else
+                    ++underrunCounter;
+            }
+            else
+            {
+                if (underrunCounter > 0)
+                    --underrunCounter;
+            }
+        }
+
+        lastSwapTime = now;
     }
 
     void updateWindowPosition (const Rectangle<int>&) {}
@@ -182,33 +210,6 @@ public:
         return numFrames;
     }
 
-    void sleepIfRenderingTooFast()
-    {
-        // When our window is entirely occluded by other windows, the system
-        // fails to correctly implement the swap interval time, so the render
-        // loop spins at full speed, burning CPU. This hack detects when things
-        // are going too fast and slows things down if necessary.
-
-        if (minSwapTimeMs > 0)
-        {
-            const double now = Time::getMillisecondCounterHiRes();
-            const int elapsed = (int) (now - lastSwapTime);
-            lastSwapTime = now;
-
-            if (isPositiveAndBelow (elapsed, minSwapTimeMs - 3))
-            {
-                if (underrunCounter > 3)
-                    Thread::sleep (minSwapTimeMs - elapsed);
-                else
-                    ++underrunCounter;
-            }
-            else
-            {
-                underrunCounter = 0;
-            }
-        }
-    }
-
     NSOpenGLContext* renderContext;
     NSOpenGLView* view;
     ReferenceCountedObjectPtr<ReferenceCountedObject> viewAttachment;