diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2014-01-20 19:58:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-28 19:33:06 +0100 |
| commit | a46198a7b31e233a9bb05502b8b3128120fb3fb1 (patch) | |
| tree | 504bc886b6f7872482a209039c57434a723ce4e9 /src | |
| parent | b8103a4e8174446584caf80c0bf1a006b25d9905 (diff) | |
QNX: Create the egl context according to the version in QSurfaceFormat
Change-Id: Iee556d51ad1d7db2593e3996da4d90d938d13e17
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxglcontext.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxglcontext.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/qnx/qqnxglcontext.cpp b/src/plugins/platforms/qnx/qqnxglcontext.cpp index 34e8150928..3e6ee201f6 100644 --- a/src/plugins/platforms/qnx/qqnxglcontext.cpp +++ b/src/plugins/platforms/qnx/qqnxglcontext.cpp @@ -132,7 +132,7 @@ QQnxGLContext::QQnxGLContext(QOpenGLContext *glContext) } } - m_eglContext = eglCreateContext(ms_eglDisplay, m_eglConfig, shareContext, contextAttrs()); + m_eglContext = eglCreateContext(ms_eglDisplay, m_eglConfig, shareContext, contextAttrs(format)); if (m_eglContext == EGL_NO_CONTEXT) { checkEGLError("eglCreateContext"); qFatal("QQnxGLContext: failed to create EGL context, err=%d", eglGetError()); @@ -274,13 +274,13 @@ EGLDisplay QQnxGLContext::getEglDisplay() { return ms_eglDisplay; } -EGLint *QQnxGLContext::contextAttrs() +EGLint *QQnxGLContext::contextAttrs(const QSurfaceFormat &format) { qGLContextDebug() << Q_FUNC_INFO; // Choose EGL settings based on OpenGL version #if defined(QT_OPENGL_ES_2) - static EGLint attrs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; + static EGLint attrs[] = { EGL_CONTEXT_CLIENT_VERSION, format.version().first, EGL_NONE }; return attrs; #else return 0; diff --git a/src/plugins/platforms/qnx/qqnxglcontext.h b/src/plugins/platforms/qnx/qqnxglcontext.h index 2b12657da9..af89586bd5 100644 --- a/src/plugins/platforms/qnx/qqnxglcontext.h +++ b/src/plugins/platforms/qnx/qqnxglcontext.h @@ -88,7 +88,7 @@ private: EGLContext m_eglContext; EGLSurface m_currentEglSurface; - static EGLint *contextAttrs(); + static EGLint *contextAttrs(const QSurfaceFormat &format); }; QT_END_NAMESPACE |