Rearchitecting to ensure we transfer the data model to renderer in correct step in declarative components.

Change-Id: I7d7e646c5e0aed13199e011d5f5f898c21c28095
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/src/datavis3dqml2/declarativebarsrenderer.cpp b/src/datavis3dqml2/declarativebarsrenderer.cpp
index 757824aa..1ecd4003 100644
--- a/src/datavis3dqml2/declarativebarsrenderer.cpp
+++ b/src/datavis3dqml2/declarativebarsrenderer.cpp
@@ -29,7 +29,8 @@ DeclarativeBarsRenderer::DeclarativeBarsRenderer(QQuickWindow *window, Bars3dCon
       m_window(window),
       m_barsRenderer(renderer)
 {
-    connect(m_window, SIGNAL(beforeRendering()), this, SLOT(render()), Qt::DirectConnection);
+    connect(m_window, SIGNAL(beforeSynchronizing()), this, SLOT(synchDataToRenderer()), Qt::DirectConnection);
+    connect(m_window, SIGNAL(beforeRendering()), this, SLOT(renderFBO()), Qt::DirectConnection);
 }
 
 DeclarativeBarsRenderer::~DeclarativeBarsRenderer()
@@ -38,7 +39,13 @@ DeclarativeBarsRenderer::~DeclarativeBarsRenderer()
     delete m_fbo;
 }
 
-void DeclarativeBarsRenderer::render()
+void DeclarativeBarsRenderer::synchDataToRenderer()
+{
+    m_barsRenderer->initializeOpenGL();
+    m_barsRenderer->synchDataToRenderer();
+}
+
+void DeclarativeBarsRenderer::renderFBO()
 {
     QSize size = rect().size().toSize();