summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-16 10:27:56 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-16 10:27:56 (GMT)
commite5534b9ba700fa2b25fa63e181e2c5f82469875d (patch)
tree37e5c64b675413b56f7dbacbe3109ae3d2d62fd1 /src/opengl
parentd4135524762c9f702f5a22a8e399ad867f7050d7 (diff)
downloadQt-e5534b9ba700fa2b25fa63e181e2c5f82469875d.zip
Qt-e5534b9ba700fa2b25fa63e181e2c5f82469875d.tar.gz
Qt-e5534b9ba700fa2b25fa63e181e2c5f82469875d.tar.bz2
doc: Fixed some qdoc errors.
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qglframebufferobject.cpp2
-rw-r--r--src/opengl/qglshaderprogram.cpp11
2 files changed, 6 insertions, 7 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index f1d2325..7bebd46 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -128,7 +128,7 @@ void QGLFramebufferObjectFormat::detach()
attachments, texture target \c GL_TEXTURE_2D, and internal format \c GL_RGBA8.
On OpenGL/ES systems, the default internal format is \c GL_RGBA.
- \sa samples(), attachment(), target(), internalTextureFormat()
+ \sa samples(), attachment(), internalTextureFormat()
*/
QGLFramebufferObjectFormat::QGLFramebufferObjectFormat()
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index c18129d..739983e 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -3082,7 +3082,7 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *
\since 4.7
- \sa setGeometryShaderOutputVertexCount
+ \sa setGeometryOutputVertexCount()
*/
int QGLShaderProgram::maxGeometryOutputVertices() const
{
@@ -3091,11 +3091,9 @@ int QGLShaderProgram::maxGeometryOutputVertices() const
return n;
}
-
-
/*!
Sets the maximum number of vertices the current geometry shader
- program will produce, if active.
+ program will produce, if active, to \a count.
\since 4.7
@@ -3129,7 +3127,7 @@ int QGLShaderProgram::geometryOutputVertexCount() const
/*!
- Sets the output type from the geometry shader, if active.
+ Sets the input type from \a inputType.
This parameter takes effect the next time the program is linked.
*/
@@ -3154,7 +3152,8 @@ GLenum QGLShaderProgram::geometryInputType() const
/*!
- Sets the output type from the geometry shader, if active.
+ Sets the output type from the geometry shader, if active, to
+ \a outputType.
This parameter takes effect the next time the program is linked.