Revert "Correctly aging renderer uniformMap"

This reverts commit 66d2e8abd97025440598b6cb7da0ba68e21348c8.

Change-Id: I9ffb1ad3a782854f45d27f0545cd8fa9536895ce

diff --git a/dali/internal/render/renderers/render-renderer.cpp b/dali/internal/render/renderers/render-renderer.cpp
index 6d0f0b7..5eb8289 100644 (file)
--- a/dali/internal/render/renderers/render-renderer.cpp
+++ b/dali/internal/render/renderers/render-renderer.cpp
@@ -563,10 +563,6 @@ void Renderer::BuildUniformIndexMap(BufferIndex bufferIndex, const SceneGraph::N
 
     mUniformIndexMap.Resize(mapIndex);
   }
-
-  // @todo Temporary workaround to reduce workload each frame. Find a better way.
-  auto& sceneGraphRenderer = const_cast<SceneGraph::Renderer&>(static_cast<const SceneGraph::Renderer&>(uniformMapDataProvider));
-  sceneGraphRenderer.AgeUniformMap();
 }
 
 void Renderer::WriteUniformBuffer(

diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp
index fbba692..dd765b8 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -177,14 +177,13 @@ void Renderer::operator delete(void* ptr)
 
 bool Renderer::PrepareRender(BufferIndex updateBufferIndex)
 {
-  switch(mRegenerateUniformMap)
+  if(mRegenerateUniformMap == UNIFORM_MAP_READY)
   {
-    case UNIFORM_MAP_READY: // Now, only set to zero on start and by render side
-    {
-      mUniformMapChanged[updateBufferIndex] = false;
-      break;
-    }
-    case REGENERATE_UNIFORM_MAP:
+    mUniformMapChanged[updateBufferIndex] = false;
+  }
+  else
+  {
+    if(mRegenerateUniformMap == REGENERATE_UNIFORM_MAP)
     {
       CollectedUniformMap& localMap = mCollectedUniformMap[updateBufferIndex];
       localMap.Clear();
@@ -205,10 +204,8 @@ bool Renderer::PrepareRender(BufferIndex updateBufferIndex)
       {
         AddMappings(localMap, mShader->GetUniformMap());
       }
-      mUniformMapChanged[updateBufferIndex] = true;
-      break;
     }
-    case COPY_UNIFORM_MAP:
+    else if(mRegenerateUniformMap == COPY_UNIFORM_MAP)
     {
       // Copy old map into current map
       CollectedUniformMap& localMap = mCollectedUniformMap[updateBufferIndex];
@@ -221,9 +218,10 @@ bool Renderer::PrepareRender(BufferIndex updateBufferIndex)
       {
         localMap[index] = *iter;
       }
-      mUniformMapChanged[updateBufferIndex] = true;
-      break;
     }
+
+    mUniformMapChanged[updateBufferIndex] = true;
+    mRegenerateUniformMap--;
   }
 
   bool rendererUpdated = mUniformMapChanged[updateBufferIndex] || mResendFlag || mRenderingBehavior == DevelRenderer::Rendering::CONTINUOUSLY;
@@ -376,14 +374,6 @@ bool Renderer::PrepareRender(BufferIndex updateBufferIndex)
   return rendererUpdated;
 }
 
-void Renderer::AgeUniformMap()
-{
-  if(mRegenerateUniformMap > 0)
-  {
-    mRegenerateUniformMap--;
-  }
-}
-
 void Renderer::SetTextures(TextureSet* textureSet)
 {
   DALI_ASSERT_DEBUG(textureSet != NULL && "Texture set pointer is NULL");

diff --git a/dali/internal/update/rendering/scene-graph-renderer.h b/dali/internal/update/rendering/scene-graph-renderer.h
index 15d0924..335e125 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-renderer.h
+++ b/dali/internal/update/rendering/scene-graph-renderer.h
@@ -433,12 +433,6 @@ public: // From UniformMapDataProvider
 
   void SetDrawCommands(Dali::DevelRenderer::DrawCommand* pDrawCommands, uint32_t size);
 
-  /**
-   * Temporary fix to age mRegenerateUniformMap from render side.
-   * (aging should only be done if renderer is visible, not when PrepareRender is called)
-   */
-  void AgeUniformMap();
-
 private:
   /**
    * Protected constructor; See also Renderer::New()