diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2012-09-24 09:41:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-24 16:59:58 +0200 |
| commit | 57b4a504ff1960c4f78308f46c04922cfd58356e (patch) | |
| tree | 315f79822c2769e707ecdb1fdceee7230fcd260b /src/gui/opengl/qopenglshaderprogram.h | |
| parent | c06106f28db343a090869b7d0f8638aa89f91640 (diff) | |
OpenGL: Remove API for stubbed Geometry shader support in gui/opengl
There is a pending patch to reinstate this for Qt 5.1 (the patch
introduces new API top QOpenGLContext). I will fold the revert of this
patch into:
https://codereview.qt-project.org/#change,31231
Note that QGLShaderProgram still supports Geometry shaders so source
compatibility with Qt 4.8 is maintained.
Change-Id: I53faedd4e4a2a6c2a9765afdc1bee6df5ae2f711
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.h')
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h index 1a499fd533..c765e7d344 100644 --- a/src/gui/opengl/qopenglshaderprogram.h +++ b/src/gui/opengl/qopenglshaderprogram.h @@ -66,8 +66,7 @@ public: enum ShaderTypeBit { Vertex = 0x0001, - Fragment = 0x0002, - Geometry = 0x0004 + Fragment = 0x0002 }; Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit) @@ -129,17 +128,6 @@ public: GLuint programId() const; - int maxGeometryOutputVertices() const; - - void setGeometryOutputVertexCount(int count); - int geometryOutputVertexCount() const; - - void setGeometryInputType(GLenum inputType); - GLenum geometryInputType() const; - - void setGeometryOutputType(GLenum outputType); - GLenum geometryOutputType() const; - void bindAttributeLocation(const char *name, int location); void bindAttributeLocation(const QByteArray& name, int location); void bindAttributeLocation(const QString& name, int location); |