summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-03-17 14:49:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-17 16:27:55 +0100
commit0a803dc90a1ce31009a4bea3f43a2f200cb3a22e (patch)
tree99ff5e4c54dc8dbb51d98b8d99e18312ef6d7e40
parentf6d3b65e455272d259f98cb900f46c8de765e174 (diff)
Add note to docs about normalization in setAttributeBuffer
Task-number: QTBUG-37103 Change-Id: I0b1716b76e10c65871c6a96dab5d8d81c95095d7 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
-rw-r--r--src/gui/opengl/qopenglshaderprogram.cpp6
-rw-r--r--src/opengl/qglshaderprogram.cpp6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index d2429cdd23..bfde270446 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 7261b68a88..65f217edf2 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
*/