summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/qnx/qqnxglcontext.cpp
diff options
context:
space:
mode:
authorJames McDonnell <jmcdonnell@blackberry.com>2018-06-01 09:36:37 -0400
committerJames McDonnell <jmcdonnell@blackberry.com>2018-07-01 17:38:40 +0000
commit84ecc17152968f7fafe2de27599fb10589534c78 (patch)
tree65aac18dd86e068cc0ac8dd1a9131557e934a6b5 /src/plugins/platforms/qnx/qqnxglcontext.cpp
parent61dabf97f24159f1a1f6c927b39b5c26c59e6c07 (diff)
QNX: Add the ability to disable EGL_KHR_surfaceless_context use
QML fails to draw when this is used on at least one jacinto6 platform. Works when it's disabled. Task-number: QTBUG-68227 Change-Id: I7b3c081d4d5a4fe22136f4bdd8ad1f34495cd94a Reviewed-by: Adam Treat <adam.treat@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxglcontext.cpp')
-rw-r--r--src/plugins/platforms/qnx/qqnxglcontext.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/platforms/qnx/qqnxglcontext.cpp b/src/plugins/platforms/qnx/qqnxglcontext.cpp
index d4493943e2..2031de308c 100644
--- a/src/plugins/platforms/qnx/qqnxglcontext.cpp
+++ b/src/plugins/platforms/qnx/qqnxglcontext.cpp
@@ -38,6 +38,7 @@
****************************************************************************/
#include "qqnxglcontext.h"
+#include "qqnxintegration.h"
#include "qqnxscreen.h"
#include "qqnxeglwindow.h"
@@ -59,8 +60,18 @@ QT_BEGIN_NAMESPACE
EGLDisplay QQnxGLContext::ms_eglDisplay = EGL_NO_DISPLAY;
+static QEGLPlatformContext::Flags makeFlags()
+{
+ QEGLPlatformContext::Flags result = 0;
+
+ if (!QQnxIntegration::options().testFlag(QQnxIntegration::SurfacelessEGLContext))
+ result |= QEGLPlatformContext::NoSurfaceless;
+
+ return result;
+}
+
QQnxGLContext::QQnxGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share)
- : QEGLPlatformContext(format, share, ms_eglDisplay)
+ : QEGLPlatformContext(format, share, ms_eglDisplay, 0, QVariant(), makeFlags())
{
}