From 8b20c0ec6d676b3b297b8fa0ee436ad2e3d9a720 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 10 Feb 2010 16:57:23 +0100 Subject: Added geometry shaders to changes-4.7.0 file + a small doc update about it --- dist/changes-4.7.0 | 3 +++ src/opengl/qglshaderprogram.cpp | 2 ++ 2 files changed, 5 insertions(+) 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 -- cgit v0.12