summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-02-10 16:07:43 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-02-10 16:07:43 (GMT)
commita0fa7657a11ceb6bffc8387b4a76a274884a9508 (patch)
treeeef8a14b82843d851404f00ee1c88e865d54f96c /src/opengl/qglshaderprogram.cpp
parent8b20c0ec6d676b3b297b8fa0ee436ad2e3d9a720 (diff)
downloadQt-a0fa7657a11ceb6bffc8387b4a76a274884a9508.zip
Qt-a0fa7657a11ceb6bffc8387b4a76a274884a9508.tar.gz
Qt-a0fa7657a11ceb6bffc8387b4a76a274884a9508.tar.bz2
Added \since 4.7 tags
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
-rw-r--r--src/opengl/qglshaderprogram.cpp14
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)
{