diff options
4 files changed, 1 insertions, 12 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 03ba1e686..64abb6fba 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -195,8 +195,6 @@ void QWaylandCompositorPrivate::init() QWaylandCompositorPrivate::~QWaylandCompositorPrivate() { - if (!destroyed_surfaces.isEmpty()) - qWarning("QWaylandCompositor::cleanupGraphicsResources() must be called manually"); qDeleteAll(clients); qDeleteAll(outputSpaces); @@ -211,7 +209,7 @@ void QWaylandCompositorPrivate::destroySurface(QWaylandSurface *surface) Q_Q(QWaylandCompositor); q->surfaceAboutToBeDestroyed(surface); - destroyed_surfaces << surface; + delete surface; } void QWaylandCompositorPrivate::unregisterSurface(QWaylandSurface *surface) @@ -505,12 +503,6 @@ uint QWaylandCompositor::currentTimeMsecs() const return d->timer.elapsed(); } -void QWaylandCompositor::cleanupGraphicsResources() -{ - Q_D(QWaylandCompositor); - qDeleteAll(d->destroyed_surfaces); - d->destroyed_surfaces.clear(); -} void QWaylandCompositor::processWaylandEvents() { diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 177172d8c..a0d416b91 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -128,7 +128,6 @@ public: void setUseHardwareIntegrationExtension(bool use); public Q_SLOTS: - void cleanupGraphicsResources(); void processWaylandEvents(); Q_SIGNALS: diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h index f73fb4e15..3fd5a0671 100644 --- a/src/compositor/compositor_api/qwaylandcompositor_p.h +++ b/src/compositor/compositor_api/qwaylandcompositor_p.h @@ -112,7 +112,6 @@ protected: QList<QWaylandOutputSpace *> outputSpaces; QList<QWaylandSurface *> all_surfaces; - QSet<QWaylandSurface *> destroyed_surfaces; QtWayland::DataDeviceManager *data_device_manager; diff --git a/src/compositor/compositor_api/qwaylandquickoutput.cpp b/src/compositor/compositor_api/qwaylandquickoutput.cpp index a32689225..1f3c60736 100644 --- a/src/compositor/compositor_api/qwaylandquickoutput.cpp +++ b/src/compositor/compositor_api/qwaylandquickoutput.cpp @@ -102,7 +102,6 @@ void QWaylandQuickOutput::updateStarted() return; frameStarted(); - compositor()->cleanupGraphicsResources(); } void QWaylandQuickOutput::doFrameCallbacks() |