summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den.exter@qinetic.com.au>2015-09-09 13:42:18 +1000
committerAndrew den Exter <andrew.den.exter@qinetic.com.au>2015-09-09 11:11:34 +0000
commit438063af85d0999f9dead6f04a3285edb175e24c (patch)
tree84dbbadd270d30fe9d161567e86f346511d5d135
parent3e35b84cf868ac954a4ebedf127d0a448e71900d (diff)
downloadqtwayland-438063af85d0999f9dead6f04a3285edb175e24c.tar.gz
Don't invalidate textures when the scene graph is stopped.
The texture often represents the last reference to the last buffer of a destroyed surface and invalidating releases that reference which shortcuts any attempt to keep the buffer alive with QWaylandUnmapLock. Change-Id: I4641a87a32f8639c3ffb6c3b5dafd21c77bbb2c1 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
-rw-r--r--src/compositor/compositor_api/qwaylandquicksurface.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index c8edcb6b..a05a5f9c 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -208,8 +208,6 @@ bool QWaylandQuickSurface::event(QEvent *e)
this, &QWaylandQuickSurface::updateTexture);
disconnect(oldWindow, &QQuickWindow::sceneGraphInvalidated,
this, &QWaylandQuickSurface::invalidateTexture);
- disconnect(oldWindow, &QQuickWindow::sceneGraphAboutToStop,
- this, &QWaylandQuickSurface::invalidateTexture);
}
return true;
@@ -226,9 +224,6 @@ bool QWaylandQuickSurface::event(QEvent *e)
connect(window, &QQuickWindow::sceneGraphInvalidated,
this, &QWaylandQuickSurface::invalidateTexture,
Qt::DirectConnection);
- connect(window, &QQuickWindow::sceneGraphAboutToStop,
- this, &QWaylandQuickSurface::invalidateTexture,
- Qt::DirectConnection);
}
return true;