summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-02-08 12:03:34 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-02-08 12:03:55 (GMT)
commite98c07e5247a5ad4876c4add595ec1897b73b190 (patch)
tree54ad771342eafa165e72655efe9de6aa22e5ddf7 /src/opengl/qglshaderprogram.h
parent760319b312aceb2cc7438ad09eecd305c1b663e8 (diff)
downloadQt-e98c07e5247a5ad4876c4add595ec1897b73b190.zip
Qt-e98c07e5247a5ad4876c4add595ec1897b73b190.tar.gz
Qt-e98c07e5247a5ad4876c4add595ec1897b73b190.tar.bz2
Another round of Geometry shader review.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
-rw-r--r--src/opengl/qglshaderprogram.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index 6dfbb77..56034ee 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -103,18 +103,18 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGLShader::ShaderType)
class QGLShaderProgramPrivate;
+#ifndef GL_EXT_geometry_shader4
+# define GL_LINES_ADJACENCY_EXT 0xA
+# define GL_LINE_STRIP_ADJACENCY_EXT 0xB
+# define GL_TRIANGLES_ADJACENCY_EXT 0xC
+# define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD
+#endif
+
+
class Q_OPENGL_EXPORT QGLShaderProgram : public QObject
{
Q_OBJECT
public:
- enum GeometryTypes
- {
- LinesWithAdjacencyGeometryType = 0xa,
- LineStripWithAdjacencyGeometryType = 0xb,
- TrianglesWithAdjacencyGeometryType = 0xc,
- TriangleStripWithAdjacencyGeometryType = 0xd
- };
-
explicit QGLShaderProgram(QObject *parent = 0);
explicit QGLShaderProgram(const QGLContext *context, QObject *parent = 0);
virtual ~QGLShaderProgram();