diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-21 23:00:15 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-21 23:00:15 (GMT) |
| commit | 28071e61a6d8ab87972bfe3feab9a0b6fdf2569f (patch) | |
| tree | 694f7b27a00769de562872c409e1d5b6a370be14 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | c676b7095d826dc2d006f52a4b234546af5e2137 (diff) | |
| parent | 45f372edda9d43bc98c7742a5dfdd89e4efbe225 (diff) | |
| download | Qt-28071e61a6d8ab87972bfe3feab9a0b6fdf2569f.zip Qt-28071e61a6d8ab87972bfe3feab9a0b6fdf2569f.tar.gz Qt-28071e61a6d8ab87972bfe3feab9a0b6fdf2569f.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
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] |