diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-07 21:22:31 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-11 08:00:15 +0000 |
| commit | dc58fc97ed9a36fa454eaa43e6f1cd7dc13a6d2d (patch) | |
| tree | 925bf7fc16fba19ca975f0e92af1bb9a2ca35894 /src/render/graphicshelpers/graphicshelpergl3_3_p.h | |
| parent | 19a8c6b46cb538ee4e628cbe50f6fa549094d7eb (diff) | |
Properly handle alpha to coverage state in non-cloning codepath
Also improve the alpha to coverage handlign in the helpers by using
a single function rather than two.
This removes GL errors about bad glFace enum values (caused by bad
handlign of alpha to coverage in switch statement, which led to a
FrontFace state being created with bad data).
Change-Id: I832d92fcb07134525f421d3a3b4d12e9f5f6428c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers/graphicshelpergl3_3_p.h')
| -rw-r--r-- | src/render/graphicshelpers/graphicshelpergl3_3_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h index 7509a91fc..d84a9ed72 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h +++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h @@ -88,7 +88,6 @@ public: 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 disablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE; void disablePrimitiveRestart() Q_DECL_OVERRIDE; @@ -98,7 +97,6 @@ public: void drawBuffers(GLsizei n, const int *bufs) 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 enablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE; void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE; @@ -113,6 +111,7 @@ public: QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE; QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) Q_DECL_OVERRIDE; void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE; + void setAlphaCoverageEnabled(bool enable) Q_DECL_OVERRIDE; void setClipPlane(int clipPlane, const QVector3D &normal, float distance) Q_DECL_OVERRIDE; void setSeamlessCubemap(bool enable) Q_DECL_OVERRIDE; void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE; |