diff options
| author | Honglei Zhang <honglei.zhang@nokia.com> | 2011-07-29 06:57:30 (GMT) |
|---|---|---|
| committer | Honglei Zhang <honglei.zhang@nokia.com> | 2011-07-29 06:57:30 (GMT) |
| commit | 8e2dc4ac2ec35e9b2f57ade5af390c2d44765382 (patch) | |
| tree | 3ce2618938f3c5cbef56223e183d4f4006fcf134 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 6d2ae84eca2ea4e74a310b4902016151a233ea5d (diff) | |
| parent | c9f0c578bbaf73211ad4729e1496e53867a641c9 (diff) | |
| download | Qt-8e2dc4ac2ec35e9b2f57ade5af390c2d44765382.zip Qt-8e2dc4ac2ec35e9b2f57ade5af390c2d44765382.tar.gz Qt-8e2dc4ac2ec35e9b2f57ade5af390c2d44765382.tar.bz2 | |
Merge remote-tracking branch 'qt/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] |