diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-11 23:42:51 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-08-11 23:42:51 (GMT) |
| commit | 72c58996a5fc7c7a1a82fefa5a0034f57383e788 (patch) | |
| tree | cde90f301afe3783f95a683dc0a54d31aafb673e /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | eb5fae761ff2aaf3d35245ac1f9d1ea10c4e84bb (diff) | |
| parent | c7b8fdf5d866b5202dada00ba175606807f69fca (diff) | |
| download | Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.zip Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.tar.gz Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
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] |