Revert "[Tizen] Update RenderState in PreRender"

This reverts commit 3631dd7b2f385093bb9be9af30e9b9fb4e0966ae.

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-application.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-application.cpp
index e71166b..440270a 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-application.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-application.cpp
@@ -220,7 +220,7 @@ bool TestApplication::PreRenderWithPartialUpdate(uint32_t intervalMilliseconds,
   DoUpdate(intervalMilliseconds, location);
 
   mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/);
-  mCore->PreRender(mRenderStatus, mScene, damagedRects);
+  mCore->PreRender(mScene, damagedRects);
 
   return mStatus.KeepUpdating() || mRenderStatus.NeedsUpdate();
 }

diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp
index 36b6319..99001f3 100644 (file)
--- a/dali/integration-api/core.cpp
+++ b/dali/integration-api/core.cpp
@@ -110,9 +110,9 @@ void Core::PreRender(RenderStatus& status, bool forceClear, bool uploadOnly)
   mImpl->PreRender(status, forceClear, uploadOnly);
 }
 
-void Core::PreRender(RenderStatus& status, Integration::Scene& scene, std::vector<Rect<int>>& damagedRects)
+void Core::PreRender(Integration::Scene& scene, std::vector<Rect<int>>& damagedRects)
 {
-  mImpl->PreRender(status, scene, damagedRects);
+  mImpl->PreRender(scene, damagedRects);
 }
 
 void Core::RenderScene(RenderStatus& status, Integration::Scene& scene, bool renderToFbo)

diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h
index a5051e5..1dd070d 100644 (file)
--- a/dali/integration-api/core.h
+++ b/dali/integration-api/core.h
@@ -351,7 +351,7 @@ public:
    * @param[in] scene The scene to be rendered.
    * @param[out] damagedRects containing damaged render items rects for this pass.
    */
-  void PreRender(RenderStatus& status, Integration::Scene& scene, std::vector<Rect<int>>& damagedRects);
+  void PreRender(Integration::Scene& scene, std::vector<Rect<int>>& damagedRects);
 
   /**
    * Render a scene in the next frame. This method should be preceded by a call up PreRender.

diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp
index 8402dd6..3b50a24 100644 (file)
--- a/dali/internal/common/core-impl.cpp
+++ b/dali/internal/common/core-impl.cpp
@@ -211,9 +211,9 @@ void Core::PreRender(RenderStatus& status, bool forceClear, bool uploadOnly)
   mRenderManager->PreRender(status, forceClear, uploadOnly);
 }
 
-void Core::PreRender(RenderStatus& status, Integration::Scene& scene, std::vector<Rect<int>>& damagedRects)
+void Core::PreRender(Integration::Scene& scene, std::vector<Rect<int>>& damagedRects)
 {
-  mRenderManager->PreRender(status, scene, damagedRects);
+  mRenderManager->PreRender(scene, damagedRects);
 }
 
 void Core::RenderScene(RenderStatus& status, Integration::Scene& scene, bool renderToFbo)

diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h
index 7c6cb29..9744d0d 100644 (file)
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -135,7 +135,7 @@ public:
   /**
    * @copydoc Dali::Integration::Core::PreRender()
    */
-  void PreRender(Integration::RenderStatus& status, Integration::Scene& scene, std::vector<Rect<int>>& damagedRects);
+  void PreRender(Integration::Scene& scene, std::vector<Rect<int>>& damagedRects);
 
   /**
    * @copydoc Dali::Integration::Core::RenderScene()

diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp
index d157b76..3c9f87c 100644 (file)
--- a/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@ -466,7 +466,7 @@ void RenderManager::PreRender(Integration::RenderStatus& status, bool forceClear
   }
 }
 
-void RenderManager::PreRender(Integration::RenderStatus& status, Integration::Scene& scene, std::vector<Rect<int>>& damagedRects)
+void RenderManager::PreRender(Integration::Scene& scene, std::vector<Rect<int>>& damagedRects)
 {
   if(mImpl->partialUpdateAvailable != Integration::PartialUpdateAvailable::TRUE)
   {
@@ -479,12 +479,9 @@ void RenderManager::PreRender(Integration::RenderStatus& status, Integration::Sc
   if(sceneObject->IsRenderingSkipped())
   {
     // We don't need to calculate dirty rects
-    status.SetNeedsUpdate(false);
     return;
   }
 
-  status.SetNeedsUpdate(true);
-
   class DamagedRectsCleaner
   {
   public:

diff --git a/dali/internal/render/common/render-manager.h b/dali/internal/render/common/render-manager.h
index 54ed12d..8b96203 100644 (file)
--- a/dali/internal/render/common/render-manager.h
+++ b/dali/internal/render/common/render-manager.h
@@ -337,7 +337,7 @@ public:
    * @param[in] scene The scene to be rendered.
    * @param[out] damagedRects The list of damaged rects for the current render pass.
    */
-  void PreRender(Integration::RenderStatus& status, Integration::Scene& scene, std::vector<Rect<int>>& damagedRects);
+  void PreRender(Integration::Scene& scene, std::vector<Rect<int>>& damagedRects);
 
   // This method should be called from Core::RenderScene()