whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenGL: Add flags and logic for newer versions of OpenGL in QGLFormat 

Change-Id: Iad57286c36c7fd205f06abc40cca5f568d572e81
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
bb10
Sean Harmer 2012-09-19 13:46:36 +01:00 committed by The Qt Project
parent 7aaf293b35
commit c45005a778
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/opengl/qgl.cpp
View File

@ -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.

5
src/opengl/qgl.h
View File

@ -228,7 +228,10 @@ public:
OpenGL_Version_3_1 = 0x00002000,
OpenGL_Version_3_2 = 0x00004000,
OpenGL_Version_3_3 = 0x00008000,
OpenGL_Version_4_0 = 0x00010000
OpenGL_Version_4_0 = 0x00010000,
OpenGL_Version_4_1 = 0x00020000,
OpenGL_Version_4_2 = 0x00040000,
OpenGL_Version_4_3 = 0x00080000
};
Q_DECLARE_FLAGS(OpenGLVersionFlags, OpenGLVersionFlag)