1 files changed, 6 insertions, 2 deletions
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index cf7e36e6b..39170567c 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -64,6 +64,7 @@
 
 QT_BEGIN_NAMESPACE
 
+class QOpenGLDebugLogger;
 class QOpenGLShaderProgram;
 class QAbstractOpenGLFunctions;
 
@@ -114,7 +115,7 @@ public:
      * this context
      */
     void releaseOpenGL();
-    void setOpenGLContext(QOpenGLContext* ctx, QSurface *surface);
+    void setOpenGLContext(QOpenGLContext* ctx);
     QOpenGLContext *openGLContext() { return m_gl; }
     bool makeCurrent(QSurface *surface);
     void doneCurrent();
@@ -220,7 +221,7 @@ private:
     GLint assignUnitForTexture(Texture* tex);
     void deactivateTexturesWithScope(TextureScope ts);
 
-    void resolveHighestOpenGLFunctions();
+    GraphicsHelperInterface *resolveHighestOpenGLFunctions();
 
     void bindFrameBufferAttachmentHelper(GLuint fboId, const AttachmentPack &attachments);
     void activateDrawBuffers(const AttachmentPack &attachments);
@@ -240,6 +241,8 @@ private:
     QHash<Qt3DCore::QNodeId, GLuint> m_renderTargets;
     QHash<GLuint, QSize> m_renderTargetsSize;
 
+    QHash<QSurface *, GraphicsHelperInterface*> m_glHelpers;
+
     // active textures, indexed by texture unit
     QVector<uint> m_activeTextures;
     QBitArray m_pinnedTextureUnits;
@@ -262,6 +265,7 @@ private:
     QByteArray m_uboTempArray;
 
     bool m_supportsVAO;
+    QScopedPointer<QOpenGLDebugLogger> m_debugLogger;
 };
 
 } // namespace Render