summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-12 13:53:21 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-12 13:53:22 +0100
commitd3b3be6865b78479da6c7e822b80064a6ea08554 (patch)
tree4843426950d1bc933ee8685c94f8905f20f3d678 /src/plugins/platforms/windows
parent7472415f3f331ccd415cc644cc210d2457ef690c (diff)
parentfd88c152db0949e47613858a914a6ae4a825781d (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r--src/plugins/platforms/windows/qwindowseglcontext.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
index 70ba2784e9..063e81150e 100644
--- a/src/plugins/platforms/windows/qwindowseglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp
@@ -393,8 +393,14 @@ QWindowsEGLContext::QWindowsEGLContext(QWindowsEGLStaticContext *staticContext,
m_shareContext = share ? static_cast<QWindowsEGLContext *>(share)->m_eglContext : nullptr;
QVector<EGLint> contextAttrs;
- contextAttrs.append(EGL_CONTEXT_CLIENT_VERSION);
- contextAttrs.append(m_format.majorVersion());
+ const int major = m_format.majorVersion();
+ const int minor = m_format.minorVersion();
+ if (major > 3 || (major == 3 && minor > 0))
+ qWarning("QWindowsEGLContext: ANGLE only partially supports OpenGL ES > 3.0");
+ contextAttrs.append(EGL_CONTEXT_MAJOR_VERSION);
+ contextAttrs.append(major);
+ contextAttrs.append(EGL_CONTEXT_MINOR_VERSION);
+ contextAttrs.append(minor);
contextAttrs.append(EGL_NONE);
QWindowsEGLStaticContext::libEGL.eglBindAPI(m_api);