Merge remote-tracking branch 'origin/2.2'

Change-Id: I8977367f3742088a51b0308496de8816e407b0c2

1 files changed, 12 insertions, 0 deletions

diff --git a/src/runtime/dragon/qdragonrenderaspect.cpp b/src/runtime/dragon/qdragonrenderaspect.cpp
index 34d4ba3..c087ed7 100644
--- a/src/runtime/dragon/qdragonrenderaspect.cpp
+++ b/src/runtime/dragon/qdragonrenderaspect.cpp
@@ -191,6 +191,8 @@ namespace Dragon {
 QDragonRenderAspect::QDragonRenderAspect(Renderer::RenderType renderType)
     : m_renderer(new Renderer(renderType))
 {
+    qDebug() << "Dragon render aspect enabled";
+
     registerBackendType<Qt3DCore::QEntity>(m_entities);
     registerBackendType<Qt3DCore::QTransform>(m_transforms);
     registerBackendType<QAbstractTexture>(m_textures);
@@ -528,6 +530,16 @@ void QDragonRenderAspect::initialize(QOpenGLContext *context)
     m_renderer->initialize(context);
 }
 
+void QDragonRenderAspect::beginRenderShutdown()
+{
+    m_renderer->beginShutdown();
+}
+
+void QDragonRenderAspect::endRenderShutdown()
+{
+    m_renderer->endShutdown();
+}
+
 } // namespace Dragon
 } // namespace Qt3DRender
 QT_END_NAMESPACE