Commit f51de354 authored by Andrew den Exter's avatar Andrew den Exter
Browse files

Revert "Don't invalidate textures when the scene graph is stopped."

This was too aggressive, if there is a queued buffer the current one
needs to be invalidated or the compositor will hold references to
both buffers while the scene graph is stopped which will block
clients in eglSwapBuffers.

This reverts commit 438063af

.

Change-Id: I3247cfc94e12322fcccc07b5dd64146b055ab431
Reviewed-by: default avatarGiulio Camuffo <giuliocamuffo@gmail.com>
parent 4d3c3a08
No related merge requests found
Showing with 5 additions and 0 deletions
...@@ -208,6 +208,8 @@ bool QWaylandQuickSurface::event(QEvent *e) ...@@ -208,6 +208,8 @@ bool QWaylandQuickSurface::event(QEvent *e)
this, &QWaylandQuickSurface::updateTexture); this, &QWaylandQuickSurface::updateTexture);
disconnect(oldWindow, &QQuickWindow::sceneGraphInvalidated, disconnect(oldWindow, &QQuickWindow::sceneGraphInvalidated,
this, &QWaylandQuickSurface::invalidateTexture); this, &QWaylandQuickSurface::invalidateTexture);
disconnect(oldWindow, &QQuickWindow::sceneGraphAboutToStop,
this, &QWaylandQuickSurface::invalidateTexture);
} }
return true; return true;
...@@ -224,6 +226,9 @@ bool QWaylandQuickSurface::event(QEvent *e) ...@@ -224,6 +226,9 @@ bool QWaylandQuickSurface::event(QEvent *e)
connect(window, &QQuickWindow::sceneGraphInvalidated, connect(window, &QQuickWindow::sceneGraphInvalidated,
this, &QWaylandQuickSurface::invalidateTexture, this, &QWaylandQuickSurface::invalidateTexture,
Qt::DirectConnection); Qt::DirectConnection);
connect(window, &QQuickWindow::sceneGraphAboutToStop,
this, &QWaylandQuickSurface::invalidateTexture,
Qt::DirectConnection);
} }
return true; return true;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment