From 91a9698b80bcb072a5ec3af69515249bac96aff5 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 14 Oct 2014 14:35:03 +0300 Subject: Simplify context handling at cleanup. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the context exists at renderer deletion, it is possible that it no longer has valid surface, which means it won't be possible to set it back to current if we change context for deletion cleanup. Since the current context will be one of our shared contexts anyway, there is no need to do a dummy context for cleanup unless the current context is null. Change-Id: Ibabe081742beb975ee848ccb3690703ef5b027a9 Reviewed-by: Mika Salmela Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/abstract3drenderer_p.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/datavisualization/engine/abstract3drenderer_p.h') diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 1857278c..38665c65 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -324,8 +324,6 @@ protected: QLocale m_locale; QPointer m_context; // Not owned - QOpenGLContext *m_currentContextAtDelete; // Not owned - QSurface *m_currentSurfaceAtDelete; // Not owned QWindow *m_dummySurfaceAtDelete; private: -- cgit v1.2.3