diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-12-28 12:12:40 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-12-28 12:44:46 (GMT) |
| commit | b06313579aad82f8dda64ad14384080754f2b222 (patch) | |
| tree | 354625ec53417ff7ba93a508436303caa1bf595d /src/opengl/gl2paintengineex/qglengineshadermanager.cpp | |
| parent | 9709b10d691857209a684495799d163098bb44eb (diff) | |
| download | Qt-b06313579aad82f8dda64ad14384080754f2b222.zip Qt-b06313579aad82f8dda64ad14384080754f2b222.tar.gz Qt-b06313579aad82f8dda64ad14384080754f2b222.tar.bz2 | |
Lots of mostly cosmetic cleanups to GL2 paint engine
* Move most of drawPixmaps to private
* Move most of stroke to private
* Remove dead code: context()
* Make optimiseForBrushTransform use xform type
* Use GLuint for uniform location
* Rename lastTexture -> lastTextureUsed
* Move qopengl2paintengine_cleanup_vectorpath to private
* Re-ordered declarations in header
* Remove dead temporaryTransform
* Rename use_system_clip -> useSystemClip
Reviewed-By: Kim
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index 9d545b9..1d3801c 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -393,7 +393,7 @@ QGLEngineShaderManager::~QGLEngineShaderManager() removeCustomStage(); } -uint QGLEngineShaderManager::getUniformLocation(Uniform id) +GLuint QGLEngineShaderManager::getUniformLocation(const Uniform id) { if (!currentShaderProg) return 0; @@ -428,9 +428,9 @@ uint QGLEngineShaderManager::getUniformLocation(Uniform id) } -void QGLEngineShaderManager::optimiseForBrushTransform(const QTransform &transform) +void QGLEngineShaderManager::optimiseForBrushTransform(const QTransform::TransformationType transformType) { - Q_UNUSED(transform); // Currently ignored + Q_UNUSED(transformType); // Currently ignored } void QGLEngineShaderManager::setDirty() |