diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-07-20 12:59:11 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-07-20 12:59:11 (GMT) |
| commit | 1075b98d6557e00618105a9d2ba58d1df9812633 (patch) | |
| tree | aa525863f9be98d7fbcdd9303bdab9b32344faa3 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 91273ff3e200082d68cfe79d314e8588107cdec3 (diff) | |
| parent | 026a27ec58ad0b0e4ff01b71ec32865514e86653 (diff) | |
| download | Qt-1075b98d6557e00618105a9d2ba58d1df9812633.zip Qt-1075b98d6557e00618105a9d2ba58d1df9812633.tar.gz Qt-1075b98d6557e00618105a9d2ba58d1df9812633.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review
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] |