We need to let the currentContext be in the same state after
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:
parent
1b1337601e
commit
5d9818e7b6
@ -115,8 +115,15 @@ void *QWaylandGLContext::getProcAddress(const QString &string)
|
||||
|
||||
void QWaylandGLContext::setEglSurface(EGLSurface surface)
|
||||
{
|
||||
doneCurrent();
|
||||
bool wasCurrent = false;
|
||||
if (QPlatformGLContext::currentContext() == this) {
|
||||
wasCurrent = true;
|
||||
doneCurrent();
|
||||
}
|
||||
mSurface = surface;
|
||||
if (wasCurrent) {
|
||||
makeCurrent();
|
||||
}
|
||||
}
|
||||
|
||||
EGLConfig QWaylandGLContext::eglConfig() const
|
||||
|
Loading…
Reference in New Issue
Block a user