diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 12:33:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 12:33:47 (GMT) |
| commit | 163b383404f25f5e951959a8d5056124567ef183 (patch) | |
| tree | 6719eecc706c30861cd62fbdd233a462dd6423c8 | |
| parent | 892d4b5e6e9495e29c4df40383e883fc19aa0baa (diff) | |
| parent | d77e3d5efbe5f83eae510990b722933d71ea8754 (diff) | |
| download | Qt-163b383404f25f5e951959a8d5056124567ef183.zip Qt-163b383404f25f5e951959a8d5056124567ef183.tar.gz Qt-163b383404f25f5e951959a8d5056124567ef183.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added \since 4.7 tags
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 170b650..a0b332d 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -3080,6 +3080,8 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 * Returns the hardware limit for how many vertices a geometry shader can output. + \since 4.7 + \sa setGeometryShaderOutputVertexCount */ int QGLShaderProgram::maxGeometryOutputVertices() const @@ -3095,6 +3097,8 @@ int QGLShaderProgram::maxGeometryOutputVertices() const Sets the maximum number of vertices the current geometry shader program will produce, if active. + \since 4.7 + This parameter takes effect the next time the program is linked. */ void QGLShaderProgram::setGeometryOutputVertexCount(int count) @@ -3114,6 +3118,8 @@ void QGLShaderProgram::setGeometryOutputVertexCount(int count) Returns the maximum number of vertices the current geometry shader program will produce, if active. + \since 4.7 + This parameter takes effect the ntext time the program is linked. */ int QGLShaderProgram::geometryOutputVertexCount() const @@ -3137,6 +3143,8 @@ void QGLShaderProgram::setGeometryInputType(GLenum inputType) Returns the geometry shader input type, if active. This parameter takes effect the next time the program is linked. + + \since 4.7 */ GLenum QGLShaderProgram::geometryInputType() const @@ -3149,6 +3157,8 @@ GLenum QGLShaderProgram::geometryInputType() const Sets the output type from the geometry shader, if active. This parameter takes effect the next time the program is linked. + + \since 4.7 */ void QGLShaderProgram::setGeometryOutputType(GLenum outputType) { @@ -3160,6 +3170,8 @@ void QGLShaderProgram::setGeometryOutputType(GLenum outputType) Returns the geometry shader output type, if active. This parameter takes effect the next time the program is linked. + + \since 4.7 */ GLenum QGLShaderProgram::geometryOutputType() const { @@ -3209,6 +3221,8 @@ void QGLShaderProgram::shaderDestroyed() The \a context is used to resolve the GLSL extensions. If \a context is null, then QGLContext::currentContext() is used. + + \since 4.7 */ bool QGLShader::hasOpenGLShaders(ShaderType type, const QGLContext *context) { |