summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
-rw-r--r--src/opengl/qglshaderprogram.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index a0b332d20c..739983ec14 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -3082,20 +3082,18 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *
\since 4.7
- \sa setGeometryShaderOutputVertexCount
+ \sa setGeometryOutputVertexCount()
*/
int QGLShaderProgram::maxGeometryOutputVertices() const
{
- int n;
+ GLint n;
glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &n);
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.