From a7e8df28c7f667a8f1e23ff865268e7f06d43328 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Thu, 14 Mar 2019 11:19:31 +0000
Subject: Fix member overloads

m_currentVAO and m_glHelper were hiding members in parent class.
Removed overloads and cleaned up initialization.

Change-Id: I174dffc63c812e0b4241018c86e560de48a31a0b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h')

diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h b/src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h
index d502a8b27..52c6034d7 100644
--- a/src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h
@@ -101,7 +101,6 @@ public:
 
     bool beginDrawing(QSurface *surface);
     void endDrawing(bool swapBuffers);
-    void activateGLHelper();
     void releaseOpenGL();
     void setOpenGLContext(QOpenGLContext* ctx);
 
@@ -198,8 +197,6 @@ private:
     QHash<GLuint, QSize> m_renderTargetsSize;
     QAbstractTexture::TextureFormat m_renderTargetFormat;
 
-    QHash<QSurface *, GraphicsHelperInterface*> m_glHelpers;
-
     // active textures, indexed by texture unit
     struct ActiveTexture {
         GLTexture *texture = nullptr;
@@ -226,7 +223,6 @@ private:
 
     // Attributes
     friend class OpenGLVertexArrayObject;
-    OpenGLVertexArrayObject *m_currentVAO;
 
     struct VAOVertexAttribute
     {
-- 
cgit v1.2.3