summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-05 11:56:35 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-05 11:56:35 (GMT)
commit1b0ad21ab4e476d4285d580eaa5dca8212b82883 (patch)
tree72ba460ab625ee6cd4e773bcbd000d2e7a5c3698 /src/opengl/qglshaderprogram.cpp
parent297a36484574f3551f2e6ac5c29ea835709100e1 (diff)
downloadQt-1b0ad21ab4e476d4285d580eaa5dca8212b82883.zip
Qt-1b0ad21ab4e476d4285d580eaa5dca8212b82883.tar.gz
Qt-1b0ad21ab4e476d4285d580eaa5dca8212b82883.tar.bz2
doc: Fixed some qdoc warnings.
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
-rw-r--r--src/opengl/qglshaderprogram.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 80b4872..dc722b3 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -1555,8 +1555,8 @@ void QGLShaderProgram::setAttributeArray
indicates the number of components per vertex: 1, 2, 3, or 4.
The array will become active when enableAttributeArray() is called
- on the \a location. Otherwise the value specified with
- setAttributeValue() for \a location will be used.
+ on the \a name. Otherwise the value specified with
+ setAttributeValue() for \a name will be used.
The setAttributeBuffer() function can be used to set the attribute
array to an offset within a vertex buffer.
@@ -1572,15 +1572,16 @@ void QGLShaderProgram::setAttributeArray
}
/*!
- Sets an array of vertex values on the attribute at \a location
- in this shader program, starting at a specific \a offset in the
+ Sets an array of vertex values on the attribute at \a location in
+ this shader program, starting at a specific \a offset in the
currently bound vertex buffer. The \a stride indicates the number
of bytes between vertices. A default \a stride value of zero
- indicates that the vertices are densely packed in \a values.
+ indicates that the vertices are densely packed in the value array.
- The \a type indicates the type of elements in the \a values array,
- usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc. The \a tupleSize
- indicates the number of components per vertex: 1, 2, 3, or 4.
+ The \a type indicates the type of elements in the vertex value
+ array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc. The \a
+ tupleSize indicates the number of components per vertex: 1, 2, 3,
+ or 4.
The array will become active when enableAttributeArray() is called
on the \a location. Otherwise the value specified with
@@ -1607,15 +1608,16 @@ void QGLShaderProgram::setAttributeBuffer
in this shader program, starting at a specific \a offset in the
currently bound vertex buffer. The \a stride indicates the number
of bytes between vertices. A default \a stride value of zero
- indicates that the vertices are densely packed in \a values.
+ indicates that the vertices are densely packed in the value array.
- The \a type indicates the type of elements in the \a values array,
- usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc. The \a tupleSize
- indicates the number of components per vertex: 1, 2, 3, or 4.
+ The \a type indicates the type of elements in the vertex value
+ array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc. The \a
+ tupleSize indicates the number of components per vertex: 1, 2, 3,
+ or 4.
The array will become active when enableAttributeArray() is called
- on the \a location. Otherwise the value specified with
- setAttributeValue() for \a location will be used.
+ on the \a name. Otherwise the value specified with
+ setAttributeValue() for \a name will be used.
\sa setAttributeArray()
\since 4.7