diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:00:58 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:00:59 +0200 |
commit | 215833472171b17db506d49646c639b4fff926ab (patch) | |
tree | 96615c2a513ec847893a0524f9a918acaa1066ba /src/datavisualization/engine/abstract3drenderer_p.h | |
parent | 1860c49b37d2235b632304f2a0c69d75c18101f2 (diff) | |
parent | e4cd15e388f675a80a9c257655a580b1b53c240a (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie398d7814f964598d57fba37744dedf78951c773
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer_p.h')
-rw-r--r-- | src/datavisualization/engine/abstract3drenderer_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index c312b771..d6ffb03c 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -191,6 +191,7 @@ Q_SIGNALS: protected: Abstract3DRenderer(Abstract3DController *controller); + virtual void contextCleanup(); virtual void initializeOpenGL(); void reInitShaders(); @@ -242,9 +243,6 @@ protected: void queriedGraphPosition(const QMatrix4x4 &projectionViewMatrix, const QVector3D &scaling, GLuint defaultFboHandle); - void fixContextBeforeDelete(); - void restoreContextAfterDelete(); - bool m_hasNegativeValues; Q3DTheme *m_cachedTheme; Drawer *m_drawer; @@ -339,7 +337,6 @@ protected: QOpenGLFunctions_2_1 *m_funcs_2_1; // Not owned #endif QPointer<QOpenGLContext> m_context; // Not owned - QOffscreenSurface *m_dummySurfaceAtDelete; bool m_isOpenGLES; private: |