Sort GraphicsContext + GraphicsHelper methods

They were a big mess, now they are a smaller mess.

Change-Id: I4e21e340a24588370cf8b17b54ebb9e03fe07b4a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

7 files changed, 211 insertions, 210 deletions

diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index 8436166f4..78b134e68 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -169,32 +169,32 @@ public:
     QGraphicsApiFilter *contextInfo() const;
 
     // Wrapper methods
-    void    drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLsizei instances, GLint baseVertex = 0, GLint baseInstance = 0);
-    void    drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances);
-    void    drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLint baseVertex = 0);
-    void    drawArrays(GLenum primitiveType, GLint first, GLsizei count);
-    void    setVerticesPerPatch(GLint verticesPerPatch);
-    void    blendEquation(GLenum mode);
     void    alphaTest(GLenum mode1, GLenum mode2);
-    void    depthTest(GLenum mode);
-    void    depthMask(GLenum mode);
-    void    cullFace(GLenum mode);
-    void    frontFace(GLenum mode);
+    void    bindBufferBase(GLenum target, GLuint bindingIndex, GLuint buffer);
     void    bindFragOutputs(GLuint shader, const QHash<QString, int> &outputs);
-    void    bindUniform(const QVariant &v, const ShaderUniform &description);
     void    bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-    void    bindBufferBase(GLenum target, GLuint bindingIndex, GLuint buffer);
-    void    buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer);
-    void    enableAlphaCoverage();
-    void    disableAlphaCoverage();
+    void    bindUniform(const QVariant &v, const ShaderUniform &description);
+    void    blendEquation(GLenum mode);
     GLuint  boundFrameBufferObject();
+    void    buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer);
     void    clearColor(const QColor &color);
-    void    enableClipPlane(int clipPlane);
+    void    cullFace(GLenum mode);
+    void    depthMask(GLenum mode);
+    void    depthTest(GLenum mode);
+    void    disableAlphaCoverage();
     void    disableClipPlane(int clipPlane);
-    GLint   maxClipPlaneCount();
-    void    enablePrimitiveRestart(int restartIndex);
     void    disablePrimitiveRestart();
+    void    drawArrays(GLenum primitiveType, GLint first, GLsizei count);
+    void    drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances);
+    void    drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLint baseVertex = 0);
+    void    drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLsizei instances, GLint baseVertex = 0, GLint baseInstance = 0);
+    void    enableAlphaCoverage();
+    void    enableClipPlane(int clipPlane);
+    void    enablePrimitiveRestart(int restartIndex);
+    void    frontFace(GLenum mode);
+    GLint   maxClipPlaneCount();
     void    pointSize(bool programmable, GLfloat value);
+    void    setVerticesPerPatch(GLint verticesPerPatch);
 
     // Helper methods
     static GLint elementType(GLint type);
diff --git a/src/render/graphicshelpers/graphicshelperes2_p.h b/src/render/graphicshelpers/graphicshelperes2_p.h
index f7d675b82..8686d678c 100644
--- a/src/render/graphicshelpers/graphicshelperes2_p.h
+++ b/src/render/graphicshelpers/graphicshelperes2_p.h
@@ -64,47 +64,48 @@ public:
     virtual ~GraphicsHelperES2();
 
     // QGraphicHelperInterface interface
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    void enableAlphaCoverage() Q_DECL_OVERRIDE;
-    void disableAlphaCoverage() Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
     void bindFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
+    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
     bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
+    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
+    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
+    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
+    void disableAlphaCoverage() Q_DECL_OVERRIDE;
+    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
+    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
     void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
+    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
+    void enableAlphaCoverage() Q_DECL_OVERRIDE;
     void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
     void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
     QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
     QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
+    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
+    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
+
 
 private:
     QOpenGLFunctions *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelpergl2_p.h b/src/render/graphicshelpers/graphicshelpergl2_p.h
index 6d7a7e8f6..3ad81bb02 100644
--- a/src/render/graphicshelpers/graphicshelpergl2_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl2_p.h
@@ -66,47 +66,47 @@ public:
     GraphicsHelperGL2();
 
     // QGraphicHelperInterface interface
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    void enableAlphaCoverage() Q_DECL_OVERRIDE;
-    void disableAlphaCoverage() Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
     void bindFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
+    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
     bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
+    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
+    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
+    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
+    void disableAlphaCoverage() Q_DECL_OVERRIDE;
+    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
+    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
     void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
+    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
+    void enableAlphaCoverage() Q_DECL_OVERRIDE;
     void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
     void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
     QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
     QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
+    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
+    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
 
 private:
     QOpenGLFunctions_2_0 *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
index 11344db63..a363a7b61 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
@@ -67,47 +67,47 @@ public:
     GraphicsHelperGL3_3();
 
     // QGraphicHelperInterface interface
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    void enableAlphaCoverage() Q_DECL_OVERRIDE;
-    void disableAlphaCoverage() Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
     void bindFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
+    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
     bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
+    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
+    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
+    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
+    void disableAlphaCoverage() Q_DECL_OVERRIDE;
+    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
+    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
     void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint bindingIndex, GLuint buffer) Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
+    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
+    void enableAlphaCoverage() Q_DECL_OVERRIDE;
     void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
     void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
     QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
     QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
+    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
+    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
 
 private:
     QOpenGLFunctions_3_3_Core *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelpergl3_p.h b/src/render/graphicshelpers/graphicshelpergl3_p.h
index 9297998fa..93afbd3fe 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_p.h
@@ -67,47 +67,47 @@ public:
     GraphicsHelperGL3();
 
     // QGraphicHelperInterface interface
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    void enableAlphaCoverage() Q_DECL_OVERRIDE;
-    void disableAlphaCoverage() Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
     void bindFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
+    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
     bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
+    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
+    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
+    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
+    void disableAlphaCoverage() Q_DECL_OVERRIDE;
+    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
+    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
     void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint bindingIndex, GLuint buffer) Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
+    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
+    void enableAlphaCoverage() Q_DECL_OVERRIDE;
     void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
     void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
     QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
     QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
+    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
+    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
 
 private:
     QOpenGLFunctions_3_2_Core *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelpergl4_p.h b/src/render/graphicshelpers/graphicshelpergl4_p.h
index b91653775..68916062b 100644
--- a/src/render/graphicshelpers/graphicshelpergl4_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl4_p.h
@@ -66,47 +66,47 @@ public:
     GraphicsHelperGL4();
 
     // QGraphicHelperInterface interface
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    void enableAlphaCoverage() Q_DECL_OVERRIDE;
-    void disableAlphaCoverage() Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
     void bindFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
+    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
     GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
     bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
+    void cullFace(GLenum mode) Q_DECL_OVERRIDE;
+    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
+    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
+    void disableAlphaCoverage() Q_DECL_OVERRIDE;
+    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
+    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
     void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint bindingIndex, GLuint buffer) Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
+    void drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
+    void enableAlphaCoverage() Q_DECL_OVERRIDE;
     void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
     void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
     QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
     QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
+    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
+    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
+    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
+    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
+    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
+    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
+    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
 
 private:
     QOpenGLFunctions_4_3_Core *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelperinterface_p.h b/src/render/graphicshelpers/graphicshelperinterface_p.h
index 6fca95516..b959b63ae 100644
--- a/src/render/graphicshelpers/graphicshelperinterface_p.h
+++ b/src/render/graphicshelpers/graphicshelperinterface_p.h
@@ -74,47 +74,47 @@ public:
     };
 
     virtual ~GraphicsHelperInterface() {}
-    virtual void    initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) = 0;
-    virtual void    drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLsizei instances, GLint baseVertex = 0, GLint baseInstance = 0) = 0;
-    virtual void    drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) = 0;
-    virtual void    drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLint baseVertex = 0) = 0;
-    virtual void    drawArrays(GLenum primitiveType, GLint first, GLsizei count) = 0;
-    virtual void    setVerticesPerPatch(GLint verticesPerPatch) = 0;
-    virtual void    useProgram(GLuint programId) = 0;
-    virtual QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) = 0;
-    virtual QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) = 0;
-    virtual QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) = 0;
-    virtual void    vertexAttribDivisor(GLuint index, GLuint divisor) = 0;
-    virtual void    blendEquation(GLenum mode) = 0;
     virtual void    alphaTest(GLenum mode1, GLenum mode2) = 0;
-    virtual void    depthTest(GLenum mode) = 0;
-    virtual void    depthMask(GLenum mode) = 0;
-    virtual void    cullFace(GLenum mode) = 0;
-    virtual void    frontFace(GLenum mode) = 0;
-    virtual void    enableAlphaCoverage() = 0;
-    virtual void    disableAlphaCoverage() = 0;
-    virtual GLuint  createFrameBufferObject() = 0;
-    virtual void    releaseFrameBufferObject(GLuint frameBufferId) = 0;
+    virtual void    bindBufferBase(GLenum target, GLuint index, GLuint buffer) = 0;
+    virtual void    bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) = 0;
+    virtual void    bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) = 0;
     virtual void    bindFrameBufferObject(GLuint frameBufferId) = 0;
+    virtual void    bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) = 0;
+    virtual void    bindUniform(const QVariant &v, const ShaderUniform &description) = 0;
+    virtual void    blendEquation(GLenum mode) = 0;
     virtual GLuint  boundFrameBufferObject() = 0;
+    virtual void    buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) = 0;
     virtual bool    checkFrameBufferComplete() = 0;
-    virtual void    bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) = 0;
-    virtual bool    supportsFeature(Feature feature) const = 0;
+    virtual GLuint  createFrameBufferObject() = 0;
+    virtual void    cullFace(GLenum mode) = 0;
+    virtual void    depthMask(GLenum mode) = 0;
+    virtual void    depthTest(GLenum mode) = 0;
+    virtual void    disableAlphaCoverage() = 0;
+    virtual void    disableClipPlane(int clipPlane) = 0;
+    virtual void    disablePrimitiveRestart() = 0;
+    virtual void    drawArrays(GLenum primitiveType, GLint first, GLsizei count) = 0;
+    virtual void    drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) = 0;
     virtual void    drawBuffers(GLsizei n, const int *bufs) = 0;
-    virtual void    bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) = 0;
-    virtual void    bindUniform(const QVariant &v, const ShaderUniform &description) = 0;
-    virtual void    bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) = 0;
-    virtual void    bindBufferBase(GLenum target, GLuint index, GLuint buffer) = 0;
-    virtual void    buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) = 0;
-    virtual uint    uniformByteSize(const ShaderUniform &description) = 0;
+    virtual void    drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLint baseVertex = 0) = 0;
+    virtual void    drawElementsInstanced(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void * indices, GLsizei instances, GLint baseVertex = 0, GLint baseInstance = 0) = 0;
+    virtual void    enableAlphaCoverage() = 0;
     virtual void    enableClipPlane(int clipPlane) = 0;
-    virtual void    disableClipPlane(int clipPlane) = 0;
-    virtual GLint   maxClipPlaneCount() = 0;
     virtual void    enablePrimitiveRestart(int primitiveRestartIndex) = 0;
-    virtual void    disablePrimitiveRestart() = 0;
-    virtual void    pointSize(bool programmable, GLfloat value) = 0;
+    virtual void    frontFace(GLenum mode) = 0;
     virtual QSize   getRenderBufferDimensions(GLuint renderBufferId) = 0;
     virtual QSize   getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) = 0;
+    virtual void    initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) = 0;
+    virtual GLint   maxClipPlaneCount() = 0;
+    virtual void    pointSize(bool programmable, GLfloat value) = 0;
+    virtual QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) = 0;
+    virtual QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) = 0;
+    virtual QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) = 0;
+    virtual void    releaseFrameBufferObject(GLuint frameBufferId) = 0;
+    virtual void    setVerticesPerPatch(GLint verticesPerPatch) = 0;
+    virtual bool    supportsFeature(Feature feature) const = 0;
+    virtual uint    uniformByteSize(const ShaderUniform &description) = 0;
+    virtual void    useProgram(GLuint programId) = 0;
+    virtual void    vertexAttribDivisor(GLuint index, GLuint divisor) = 0;
 };