1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We need to let the currentContext be in the same state after

Browse Source 
setting the new eglsurface
(cherry picked from commit af3efefeefe686e5c35ed502de077c0bcb6f6fc0)

Change-Id: Ic1d62b21a1482d1bc7f1d99478e175e4b767e157
Reviewed-on: http://codereview.qt.nokia.com/1209
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
This commit is contained in:
Jørgen Lind 2011-05-27 02:12:02 -07:00 committed by Qt by Nokia
parent 1b1337601e
commit 5d9818e7b6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
View File

@ -115,8 +115,15 @@ void *QWaylandGLContext::getProcAddress(const QString &string)
void QWaylandGLContext::setEglSurface(EGLSurface surface) void QWaylandGLContext::setEglSurface(EGLSurface surface)
{ {
doneCurrent(); bool wasCurrent = false;
if (QPlatformGLContext::currentContext() == this) {
wasCurrent = true;
doneCurrent();
}
mSurface = surface; mSurface = surface;
if (wasCurrent) {
makeCurrent();
}
} }
EGLConfig QWaylandGLContext::eglConfig() const EGLConfig QWaylandGLContext::eglConfig() const