diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-22 12:12:14 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-22 12:12:14 (GMT) |
| commit | 9eec07d3ad0c43a044e169841c431c8576967465 (patch) | |
| tree | 0460a8f75c80af88bc0fa3c344d0abbb5d2f82a5 /src/opengl | |
| parent | 2ab883ca32df15f649b98120278707e078668c05 (diff) | |
| parent | 0a5c8216bfd0fcb733d99b388a7b87ffafbf0172 (diff) | |
| download | Qt-9eec07d3ad0c43a044e169841c431c8576967465.zip Qt-9eec07d3ad0c43a044e169841c431c8576967465.tar.gz Qt-9eec07d3ad0c43a044e169841c431c8576967465.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index 9fd9e18..8183f08 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -184,6 +184,9 @@ QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context) simpleShaderProg->addShader(vertexShader); simpleShaderProg->addShader(fragShader); simpleShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR); + simpleShaderProg->bindAttributeLocation("pmvMatrix1", QT_PMV_MATRIX_1_ATTR); + simpleShaderProg->bindAttributeLocation("pmvMatrix2", QT_PMV_MATRIX_2_ATTR); + simpleShaderProg->bindAttributeLocation("pmvMatrix3", QT_PMV_MATRIX_3_ATTR); simpleShaderProg->link(); if (!simpleShaderProg->isLinked()) { qCritical() << "Errors linking simple shader:" |