From 867a098d9017e47923df510ec0e8f344b470ab96 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Tue, 2 Aug 2016 14:59:28 +0200
Subject: Cleanup UpdateShaderDataTransformJob

Change-Id: I31a68be6bcbf759ca90c65c86dc8a8632731862f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 src/render/jobs/updateshaderdatatransformjob.cpp | 36 ------------------------
 src/render/jobs/updateshaderdatatransformjob_p.h |  3 --
 2 files changed, 39 deletions(-)

diff --git a/src/render/jobs/updateshaderdatatransformjob.cpp b/src/render/jobs/updateshaderdatatransformjob.cpp
index a24517d51..9d547999a 100644
--- a/src/render/jobs/updateshaderdatatransformjob.cpp
+++ b/src/render/jobs/updateshaderdatatransformjob.cpp
@@ -74,11 +74,6 @@ void UpdateShaderDataTransformJob::setManagers(NodeManagers *manager)
 }
 
 void UpdateShaderDataTransformJob::run()
-{
-    parseNodes();
-}
-
-void UpdateShaderDataTransformJob::parseNodes()
 {
     EntityManager *manager = m_manager->renderNodesManager();
     const QVector<HEntity> handles = manager->activeHandles();
@@ -89,37 +84,6 @@ void UpdateShaderDataTransformJob::parseNodes()
         const QVector<ShaderData *> shaderDatas = node->renderComponents<ShaderData>();
         for (ShaderData *r : shaderDatas)
             r->updateWorldTransform(*node->worldTransform());
-
-        // TO DO: This will be moved to a separate job in a follow up commit
-
-        // Look if for the GeometryRender/Geometry the attributes and or buffers are dirty
-        // in which case we need to recompute the triangle list
-        GeometryRenderer *geomRenderer = node->renderComponent<GeometryRenderer>();
-        Geometry *geom = nullptr;
-        if (geomRenderer &&
-                (geom = m_manager->lookupResource<Geometry, GeometryManager>(geomRenderer->geometryId())) != nullptr) {
-            const Qt3DCore::QNodeId geomRendererId = geomRenderer->peerId();
-            if (!m_manager->geometryRendererManager()->isGeometryRendererScheduledForTriangleDataRefresh(geomRendererId)) {
-                // Check if the attributes or buffers are dirty
-                bool dirty = geomRenderer->isDirty();
-                Attribute *attr = nullptr;
-                const auto attrIds = geom->attributes();
-                for (const Qt3DCore::QNodeId attrId : attrIds) {
-                    if ((attr = m_manager->attributeManager()->lookupResource(attrId)) != nullptr) {
-                        dirty |= attr->isDirty();
-                        if (!dirty) {
-                            Buffer *buffer = nullptr;
-                            if ((buffer = m_manager->bufferManager()->lookupResource(attr->bufferId())) != nullptr)
-                                dirty = buffer->isDirty();
-                        }
-                        if (dirty)
-                            break;
-                    }
-                }
-                if (dirty)
-                    m_manager->geometryRendererManager()->requestTriangleDataRefreshForGeometryRenderer(geomRendererId);
-            }
-        }
     }
 }
 
diff --git a/src/render/jobs/updateshaderdatatransformjob_p.h b/src/render/jobs/updateshaderdatatransformjob_p.h
index 7951121e1..7159bcf86 100644
--- a/src/render/jobs/updateshaderdatatransformjob_p.h
+++ b/src/render/jobs/updateshaderdatatransformjob_p.h
@@ -61,7 +61,6 @@ namespace Qt3DRender {
 namespace Render {
 
 class NodeManagers;
-class Entity;
 
 class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateShaderDataTransformJob : public Qt3DCore::QAspectJob
 {
@@ -75,8 +74,6 @@ protected:
     void run() Q_DECL_FINAL;
 
 private:
-    void parseNodes();
-
     NodeManagers *m_manager;
 };
 
-- 
cgit v1.2.3