diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-01-22 10:10:35 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-01-22 10:14:13 (GMT) |
| commit | ec44f83c4c7fa77e609a2458c4a5e26054fd5e85 (patch) | |
| tree | ba36b2c2e1b1f806ab20038c5f19930000d707d2 | |
| parent | fa41110be15ce458bd2b49bda03b147775d2ab01 (diff) | |
| download | Qt-ec44f83c4c7fa77e609a2458c4a5e26054fd5e85.zip Qt-ec44f83c4c7fa77e609a2458c4a5e26054fd5e85.tar.gz Qt-ec44f83c4c7fa77e609a2458c4a5e26054fd5e85.tar.bz2 | |
Fix rendering with simple shader in GL2 engine
Need to bind the PMV matrix's attributes to their indexes in the
simple shader, which is created in a seperate code path to all the
other shaders. This should fix the qgl autotest failures.
Reviewed-By: TrustMe
| -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:" |