diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2012-09-19 13:46:36 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-19 16:16:20 +0200 |
commit | c45005a77890a14d20498d3a829f70ce209f3742 (patch) | |
tree | c2bb16f50397fcf0cfddd4731e95a9a4eb5a7430 /src/opengl/qgl.cpp | |
parent | 7aaf293b3573e6c6f2dd22ed91095b61fe342e58 (diff) |
OpenGL: Add flags and logic for newer versions of OpenGL in QGLFormat
Change-Id: Iad57286c36c7fd205f06abc40cca5f568d572e81
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r-- | src/opengl/qgl.cpp | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 2bd10de389..d17a2792bc 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1173,6 +1173,21 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co QGLFormat::OpenGL_Version_3_2 | QGLFormat::OpenGL_Version_3_3 | QGLFormat::OpenGL_Version_4_0; + switch (versionString[2].toLatin1()) { + case '3': + versionFlags |= QGLFormat::OpenGL_Version_4_3; + case '2': + versionFlags |= QGLFormat::OpenGL_Version_4_2; + case '1': + versionFlags |= QGLFormat::OpenGL_Version_4_1; + case '0': + break; + default: + versionFlags |= QGLFormat::OpenGL_Version_4_1 | + QGLFormat::OpenGL_Version_4_2 | + QGLFormat::OpenGL_Version_4_3; + break; + } } else { versionFlags |= QGLFormat::OpenGL_Version_1_1 | QGLFormat::OpenGL_Version_1_2 | @@ -1185,7 +1200,10 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co QGLFormat::OpenGL_Version_3_1 | QGLFormat::OpenGL_Version_3_2 | QGLFormat::OpenGL_Version_3_3 | - QGLFormat::OpenGL_Version_4_0; + QGLFormat::OpenGL_Version_4_0 | + QGLFormat::OpenGL_Version_4_1 | + QGLFormat::OpenGL_Version_4_2 | + QGLFormat::OpenGL_Version_4_3; } } return versionFlags; @@ -1228,6 +1246,12 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co \value OpenGL_Version_4_0 OpenGL version 4.0 or higher is present. + \value OpenGL_Version_4_1 OpenGL version 4.1 or higher is present. + + \value OpenGL_Version_4_2 OpenGL version 4.2 or higher is present. + + \value OpenGL_Version_4_3 OpenGL version 4.3 or higher is present. + \value OpenGL_ES_CommonLite_Version_1_0 OpenGL ES version 1.0 Common Lite or higher is present. \value OpenGL_ES_Common_Version_1_0 OpenGL ES version 1.0 Common or higher is present. |