From 72aeb207c5ac8c0a8b60d0b5570df8bf9665c1c8 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 19 Jul 2011 16:52:20 +0200 Subject: Doc: Fixed shader program snippet. Task-number: QTBUG-18982 Reviewed-by: Kim Motoyoshi Kalland (cherry picked from commit 41287c411cb4b1019d12a49ddf7a738174a42f25) Change-Id: I416411623037830abadbb3cf0a9d1d7aad6f1b96 Reviewed-on: http://codereview.qt-project.org/1987 Reviewed-by: Qt Sanity Bot Reviewed-by: Toby Tomkins Reviewed-by: Peter Yard --- doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp index aa5225a5e8..812adf967f 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] -- cgit v1.2.3