diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-10 15:57:23 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-10 15:57:23 (GMT) |
| commit | 8b20c0ec6d676b3b297b8fa0ee436ad2e3d9a720 (patch) | |
| tree | d95bd290982fbf9a93db332e56a3f8c5d8028670 | |
| parent | 1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed (diff) | |
| download | Qt-8b20c0ec6d676b3b297b8fa0ee436ad2e3d9a720.zip Qt-8b20c0ec6d676b3b297b8fa0ee436ad2e3d9a720.tar.gz Qt-8b20c0ec6d676b3b297b8fa0ee436ad2e3d9a720.tar.bz2 | |
Added geometry shaders to changes-4.7.0 file + a small doc update about it
| -rw-r--r-- | dist/changes-4.7.0 | 3 | ||||
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0 index 92f5244..3504763 100644 --- a/dist/changes-4.7.0 +++ b/dist/changes-4.7.0 @@ -24,6 +24,9 @@ General Improvements - Documentation and Examples +- Support for the GL_EXT_geometry_shader4, aka Geometry Shaders, was added + to QGLShaderProgram. + Third party components ---------------------- diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 8e256ab..170b650 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -143,6 +143,8 @@ QT_BEGIN_NAMESPACE \value Vertex Vertex shader written in the OpenGL Shading Language (GLSL). \value Fragment Fragment shader written in the OpenGL Shading Language (GLSL). + \value Geometry Geometry shaders written in the OpenGL Shading + Language (GLSL), based on the GL_EXT_geometry_shader4 extension. */ #ifndef GL_FRAGMENT_SHADER |