diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-07-26 13:30:24 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-07-26 13:30:24 (GMT) |
| commit | 16502c81a92cc4a0c4d8753372b568cdc61f0c53 (patch) | |
| tree | 79a303d8b7b17f086f5d830850c2f19bc004bc9f /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 4fe2205d2fe1e8eaf3d4122c74a29862b5d04bfe (diff) | |
| parent | aa19362a14ce20bde2ada61edf7b946019845ed2 (diff) | |
| download | Qt-16502c81a92cc4a0c4d8753372b568cdc61f0c53.zip Qt-16502c81a92cc4a0c4d8753372b568cdc61f0c53.tar.gz Qt-16502c81a92cc4a0c4d8753372b568cdc61f0c53.tar.bz2 | |
Merge remote-tracking branch 'upstream/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] |