1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GLX: request up to OpenGL 4.5 / ES 3.1 by default

Browse Source 
Change-Id: I55fd53a8f7f81708a103e24e35c09894b939f245
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Giuseppe D'Angelo 2014-08-12 10:22:20 +02:00
parent a9fa9b80f5
commit e60079a55c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/xcb/qglxintegration.cpp
View File

@ -213,17 +213,17 @@ void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share)
QVector<int> glVersions; QVector<int> glVersions;
if (m_format.renderableType() == QSurfaceFormat::OpenGL) { if (m_format.renderableType() == QSurfaceFormat::OpenGL) {
if (requestedVersion > 43) if (requestedVersion > 45)
glVersions << requestedVersion; glVersions << requestedVersion;
// Don't bother with versions below 2.0 // Don't bother with versions below 2.0
glVersions << 43 << 42 << 41 << 40 << 33 << 32 << 31 << 30 << 21 << 20; glVersions << 45 << 44 << 43 << 42 << 41 << 40 << 33 << 32 << 31 << 30 << 21 << 20;
} else if (m_format.renderableType() == QSurfaceFormat::OpenGLES) { } else if (m_format.renderableType() == QSurfaceFormat::OpenGLES) {
if (requestedVersion > 30) if (requestedVersion > 31)
glVersions << requestedVersion; glVersions << requestedVersion;
// Don't bother with versions below ES 2.0 // Don't bother with versions below ES 2.0
glVersions << 30 << 20; glVersions << 31 << 30 << 20;
// ES does not support any format option // ES does not support any format option
m_format.setOptions(QSurfaceFormat::FormatOptions()); m_format.setOptions(QSurfaceFormat::FormatOptions());
} }