From 1a350077ff6aae315b87f220276f3fba8038d93d Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 14 Aug 2018 09:03:57 +0200
Subject: Revert "macOS: Don't call [NSOpenGLContext update] for every frame"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 823acb069d92b68b36f1b2bb59575bb0595275b4.

It caused some test failures in qtdeclarative and etc.

Task-number: QTBUG-69891
Change-Id: I2e4038a46de254834e6389c63f6dad0c2e523b8e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/cocoa/qcocoaglcontext.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qcocoaglcontext.h')

diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h
index 3f7966b247..0e5934bc23 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@@ -41,9 +41,6 @@
 #define QCOCOAGLCONTEXT_H
 
 #include <QtCore/QPointer>
-#include <QtCore/qvector.h>
-#include <QtCore/private/qcore_mac_p.h>
-
 #include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QWindow>
@@ -68,6 +65,8 @@ public:
     bool isSharing() const override;
     bool isValid() const override;
 
+    void windowWasHidden();
+
     NSOpenGLContext *nativeContext() const;
 
     QFunctionPointer getProcAddress(const char *procName) override;
@@ -75,14 +74,14 @@ public:
 private:
     static NSOpenGLPixelFormat *pixelFormatForSurfaceFormat(const QSurfaceFormat &format);
 
-    bool setDrawable(QPlatformSurface *surface);
+    bool setActiveWindow(QWindow *window);
     void updateSurfaceFormat();
 
     NSOpenGLContext *m_context = nil;
     NSOpenGLContext *m_shareContext = nil;
     QSurfaceFormat m_format;
+    QPointer<QWindow> m_currentWindow;
     bool m_didCheckForSoftwareContext = false;
-    QVarLengthArray<QMacScopedObserver, 3> m_observers;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3