diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-18 03:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-18 03:00:45 +0200 |
| commit | c37b1082f9402c0655dcf71df2083739823e01b1 (patch) | |
| tree | ec28ee997ac38d6f777b97d4472abe176176b0c8 /src/hardwareintegration | |
| parent | 8be3eb7f2881b639b8f6b924908f3e11c0cbe0b7 (diff) | |
| parent | ae4326db18b99630766e73c2f873eb883db2f493 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I27420ad626a0c6a18b9a11c6ffdc102006fe78e0
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp index 4f2aa8af5..1467d8c9a 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp @@ -422,6 +422,9 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface) return false; } + //### setCurrentContext will be called in QOpenGLContext::makeCurrent after this function + // returns, but that's too late, as we need a current context in order to bind the content FBO. + QOpenGLContextPrivate::setCurrentContext(context()); window->bindContentFBO(); return true; |