diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2013-02-02 23:06:51 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 10:42:21 +0100 |
| commit | 2ca46a5526e4341a620b5c9adf93844fb9fddea9 (patch) | |
| tree | ded763d1544e2531d30b4ac393a5cb3d59a74844 /src/gui/opengl/qopengl.h | |
| parent | c474f404526d82f74e3272e1debbc7f50679e9eb (diff) | |
OpenGL: Add support for OpenGL 4 tessellation shader stages
This adds support for OpenGL 4 tessellation shader stages to
QOpenGLShaderProgram and QOpenGLShader.
Change-Id: Iefb2f411e00767990d54670c5d39413be694dd66
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/opengl/qopengl.h')
| -rw-r--r-- | src/gui/opengl/qopengl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 1f99738a9f..df63eac1f7 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -100,11 +100,15 @@ typedef GLfloat GLdouble; #endif // Desktops, apart from Mac OS X prior to 10.7 can support OpenGL 3 +// and desktops apart from Mac can support OpenGL 4 #if !defined(QT_OPENGL_ES_2) # if !defined(Q_OS_MAC) || (defined(Q_OS_MAC) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) # define QT_OPENGL_3 # define QT_OPENGL_3_2 # endif +#if !defined(Q_OS_MAC) +# define QT_OPENGL_4 +#endif #endif QT_BEGIN_NAMESPACE |