diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-22 11:09:33 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-22 11:09:33 (GMT) |
| commit | d1f25aad71725b66ddcac52d84999d592ad4d132 (patch) | |
| tree | 40eab0cb0969271e7b458da90d934d71df715511 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 500f8a4368be85a0ae8b7c46012deb0ab0c844ad (diff) | |
| parent | b8327a0d5c5192750f7bf959290f6a50cdcb85b5 (diff) | |
| download | Qt-d1f25aad71725b66ddcac52d84999d592ad4d132.zip Qt-d1f25aad71725b66ddcac52d84999d592ad4d132.tar.gz Qt-d1f25aad71725b66ddcac52d84999d592ad4d132.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
| -rw-r--r-- | doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp index aa5225a..812adf9 100644 --- a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp +++ b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp @@ -52,7 +52,7 @@ program.bind(); //! [1] program.addShaderFromSourceCode(QGLShader::Vertex, "attribute highp vec4 vertex;\n" - "attribute mediump mat4 matrix;\n" + "uniform highp mat4 matrix;\n" "void main(void)\n" "{\n" " gl_Position = matrix * vertex;\n" @@ -67,7 +67,7 @@ program.link(); program.bind(); int vertexLocation = program.attributeLocation("vertex"); -int matrixLocation = program.attributeLocation("matrix"); +int matrixLocation = program.uniformLocation("matrix"); int colorLocation = program.uniformLocation("color"); //! [1] |