summaryrefslogtreecommitdiffstats
path: root/src/core/compositor/display_gl_output_surface.cpp
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2022-02-02 19:05:33 +0100
committerKirill Burtsev <kirill.burtsev@qt.io>2022-02-04 11:06:03 +0100
commit16b2976e2c983cabe6011cd732e3ec46e3402d22 (patch)
tree36a7ac6ef2c23de7fc87d352a2e3ff95f90afa6b /src/core/compositor/display_gl_output_surface.cpp
parenta4b28af742592284208a078cee26b20239b72c3e (diff)
Fix accumulation of compositor-observer bindings for skia-on-gl
One of Compositor's derived classes, DisplaySkiaOutputDevice, was missing call to 'unbind' from its observer, leading to not releasing binding from global cache on destroy. Since unbind is done on destroy, remove all explicit calls to unbind from derived classes, and just do them in their base implementations. Ammends b117909825. Pick-to: 6.2 6.3 Change-Id: I75c909eaa22ca1946ad67aa5093a8ee268c3562b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/compositor/display_gl_output_surface.cpp')
-rw-r--r--src/core/compositor/display_gl_output_surface.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/compositor/display_gl_output_surface.cpp b/src/core/compositor/display_gl_output_surface.cpp
index 7f27b6ac4..cdc93ce62 100644
--- a/src/core/compositor/display_gl_output_surface.cpp
+++ b/src/core/compositor/display_gl_output_surface.cpp
@@ -67,7 +67,6 @@ DisplayGLOutputSurface::DisplayGLOutputSurface(
DisplayGLOutputSurface::~DisplayGLOutputSurface()
{
- unbind();
m_vizContextProvider->SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback());
m_gl->DeleteFramebuffers(1, &m_fboId);
}