iOS: Move handling of FBOs to QIOSContext instead of QIOSWindow

The lifetime of an FBO is tied to its context, so letting each window
manage its own FBO failed when the window tried to delete the FBO
at destruction time without the proper context being current, or
even available anymore.

We solve this by moving all handling of FBOs to the context itself,
which is fine as we're exposing the necessary bits from the window
to allocate storage based on its layer.

Change-Id: I8c7c96cf63d6b667527c816f10ac2f4ff6a05e0c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

1 files changed, 2 insertions, 9 deletions

diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index 63099682f1..1f36c525ce 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -67,9 +67,9 @@ public:
     void handleContentOrientationChange(Qt::ScreenOrientation orientation);
     void setVisible(bool visible);
 
-    GLuint framebufferObject(const QIOSContext &context) const;
-    GLuint colorRenderbuffer(const QIOSContext &context) const;
     qreal devicePixelRatio() const;
+    int effectiveWidth() const;
+    int effectiveHeight() const;
 
     UIView *nativeView() const { return m_view; }
 
@@ -77,13 +77,6 @@ private:
     UIView *m_view;
     QRect m_requestedGeometry;
 
-    mutable struct GLData {
-        GLuint framebufferObject;
-        GLuint colorRenderbuffer;
-        GLuint depthRenderbuffer;
-        GLint renderbufferWidth;
-        GLint renderbufferHeight;
-    } m_glData;
     qreal m_devicePixelRatio;
 };