diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-02-15 09:56:02 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-16 10:29:29 +0000 |
| commit | 0a399dbc2c0c8338522af0e106cea2d68c44c4b2 (patch) | |
| tree | bd6a5a952c04c478ba2d88982f43dfe017b3e4f0 /src/render/graphicshelpers/graphicshelpergl3_3_p.h | |
| parent | 5bceaee38908934078bbdb62b564daa68f7e182b (diff) | |
QMemoryBarrier cleanup
-rename barriertypes to waitOperation
-in QML introduce a waitFor property
-remove the Barrier suffix for the enum values
-rename BarrierType to Operation
Task-number: QTBUG-58878
Change-Id: Idc65f44b09e632509cd74286de26fea02e6b6dee
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers/graphicshelpergl3_3_p.h')
| -rw-r--r-- | src/render/graphicshelpers/graphicshelpergl3_3_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h index 6d87c99b7..c093c801e 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h +++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h @@ -112,7 +112,7 @@ public: void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE; void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE; GLint maxClipPlaneCount() Q_DECL_OVERRIDE; - void memoryBarrier(QMemoryBarrier::BarrierTypes barriers) Q_DECL_OVERRIDE; + void memoryBarrier(QMemoryBarrier::Operations barriers) 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; |