From 0a803dc90a1ce31009a4bea3f43a2f200cb3a22e Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 17 Mar 2014 14:49:29 +0100 Subject: [PATCH] Add note to docs about normalization in setAttributeBuffer Task-number: QTBUG-37103 Change-Id: I0b1716b76e10c65871c6a96dab5d8d81c95095d7 Reviewed-by: Gunnar Sletta --- src/gui/opengl/qopenglshaderprogram.cpp | 6 ++++++ src/opengl/qglshaderprogram.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index d2429cdd231..bfde2704461 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -1516,6 +1516,9 @@ void QOpenGLShaderProgram::setAttributeArray The setAttributeBuffer() function can be used to set the attribute array to an offset within a vertex buffer. + \note Normalization will be enabled. If this is not desired, call + glVertexAttribPointer directly through QOpenGLFunctions. + \sa setAttributeValue(), setUniformValue(), enableAttributeArray() \sa disableAttributeArray(), setAttributeBuffer() */ @@ -1659,6 +1662,9 @@ void QOpenGLShaderProgram::setAttributeArray on the \a location. Otherwise the value specified with setAttributeValue() for \a location will be used. + \note Normalization will be enabled. If this is not desired, call + glVertexAttribPointer directly through QOpenGLFunctions. + \sa setAttributeArray() */ void QOpenGLShaderProgram::setAttributeBuffer diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 7261b68a883..65f217edf2d 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -1553,6 +1553,9 @@ void QGLShaderProgram::setAttributeArray The setAttributeBuffer() function can be used to set the attribute array to an offset within a vertex buffer. + \note Normalization will be enabled. If this is not desired, call + glVertexAttribPointer directly through QGLFunctions. + \sa setAttributeValue(), setUniformValue(), enableAttributeArray() \sa disableAttributeArray(), setAttributeBuffer() \since 4.7 @@ -1698,6 +1701,9 @@ void QGLShaderProgram::setAttributeArray on the \a location. Otherwise the value specified with setAttributeValue() for \a location will be used. + \note Normalization will be enabled. If this is not desired, call + glVertexAttribPointer directly though QGLFunctions. + \sa setAttributeArray() \since 4.7 */