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

XCB GLX: request OpenGL 4.6 / OpenGL ES 3.2 if possible

Browse Source 
Code was lagging a bit behind published standards.

Change-Id: I0fe07c0162a54d9eed8b539887496b9313b37aa4
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Giuseppe D'Angelo 2017-07-31 22:56:40 +02:00 committed by Jędrzej Nowacki
parent 02b0f44fab
commit 37af667771
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/gl_integrations/xcb_glx/qglxintegration.cpp
View File

@ -221,17 +221,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 > 45) if (requestedVersion > 46)
glVersions << requestedVersion; glVersions << requestedVersion;
// Don't bother with versions below 2.0 // Don't bother with versions below 2.0
glVersions << 45 << 44 << 43 << 42 << 41 << 40 << 33 << 32 << 31 << 30 << 21 << 20; glVersions << 46 << 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 > 31) if (requestedVersion > 32)
glVersions << requestedVersion; glVersions << requestedVersion;
// Don't bother with versions below ES 2.0 // Don't bother with versions below ES 2.0
glVersions << 31 << 30 << 20; glVersions << 32 << 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());
} }