diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:01:00 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-02-20 09:51:12 +0100 |
| commit | 035f934d7a798e97bf0213a5d42a3d511132f03d (patch) | |
| tree | 89aa6efdc86864ce479cddca6b9c4ba523c2754a /src/gui/opengl/qopengl.cpp | |
| parent | f4cc23cffbe3005f0a522cac938695e87ecd6407 (diff) | |
| parent | da4ab444ffac37514435364d4d3f0ad59d4f9bc3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.
Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273
Diffstat (limited to 'src/gui/opengl/qopengl.cpp')
| -rw-r--r-- | src/gui/opengl/qopengl.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index e961c42a25..2b1e57a4bb 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -60,6 +60,10 @@ QT_BEGIN_NAMESPACE typedef const GLubyte * (QOPENGLF_APIENTRYP qt_glGetStringi)(GLenum, GLuint); #endif +#ifndef GL_CONTEXT_LOST +#define GL_CONTEXT_LOST 0x0507 +#endif + QOpenGLExtensionMatcher::QOpenGLExtensionMatcher() { QOpenGLContext *ctx = QOpenGLContext::currentContext(); @@ -80,8 +84,13 @@ QOpenGLExtensionMatcher::QOpenGLExtensionMatcher() } else { #ifdef QT_OPENGL_3 // clear error state - while (funcs->glGetError()) {} - + while (true) { // Clear error state. + GLenum error = funcs->glGetError(); + if (error == GL_NO_ERROR) + break; + if (error == GL_CONTEXT_LOST) + return; + }; qt_glGetStringi glGetStringi = (qt_glGetStringi)ctx->getProcAddress("glGetStringi"); if (!glGetStringi) |