diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-05 00:25:12 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-05 06:46:05 (GMT) |
| commit | b91f1a2f749586014e8b28c6766015ff6ba62ee7 (patch) | |
| tree | b7c4eebcd52754645f463b363a425ce163f643a9 /src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | |
| parent | 23572588c4b0c759c14a6c1687e5bd86461e31e8 (diff) | |
| download | Qt-b91f1a2f749586014e8b28c6766015ff6ba62ee7.zip Qt-b91f1a2f749586014e8b28c6766015ff6ba62ee7.tar.gz Qt-b91f1a2f749586014e8b28c6766015ff6ba62ee7.tar.bz2 | |
Modify QGLShader and QGLShaderProgram in response to API review
Reviewed-by: Sarah Smith
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index a9744b3..d20700f 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -246,7 +246,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height) glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray); glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray); - pex->shaderManager->blitProgram()->enable(); + pex->shaderManager->blitProgram()->bind(); pex->shaderManager->blitProgram()->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT); pex->shaderManager->setDirty(); @@ -395,7 +395,7 @@ void QGL2PaintEngineExPrivate::setBrush(const QBrush* brush) void QGL2PaintEngineExPrivate::useSimpleShader() { - shaderManager->simpleProgram()->enable(); + shaderManager->simpleProgram()->bind(); shaderManager->setDirty(); if (matrixDirty) |