1 files changed, 33 insertions, 32 deletions
diff --git a/src/render/graphicshelpers/graphicshelpergl3_p.h b/src/render/graphicshelpers/graphicshelpergl3_p.h
index 9297998fa..59337a690 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_p.h
@@ -67,47 +67,48 @@ 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;
+    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) 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;