From d016d5b607229f9de13e9754a57c68b4d31c586d Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 14 Dec 2021 14:29:23 +0900 Subject: [PATCH] Revert "[Tizen] Do not call PreRender if rendering will be skipped" This reverts commit 10b06afe626b500690bd0788ac9eb2d0464c80af. --- .../src/dali-adaptor/dali-test-suite-utils/test-application.cpp | 2 +- dali/internal/adaptor/common/combined-update-render-controller.cpp | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp index e71166b..440270a 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp +++ b/automated-tests/src/dali-adaptor/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/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp index c8e0d1b..356cec0 100644 --- a/dali/internal/adaptor/common/combined-update-render-controller.cpp +++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp @@ -694,7 +694,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() mDamagedRects.clear(); // Collect damage rects - mCore.PreRender(windowRenderStatus, scene, mDamagedRects); + mCore.PreRender(scene, mDamagedRects); // Render off-screen frame buffers first if any mCore.RenderScene(windowRenderStatus, scene, true); @@ -702,10 +702,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() Rect clippingRect; // Empty for fbo rendering // Switch to the context of the surface, merge damaged areas for previous frames - if(windowRenderStatus.NeedsUpdate()) - { - windowSurface->PreRender(sceneSurfaceResized, mDamagedRects, clippingRect); // Switch GL context - } + windowSurface->PreRender(sceneSurfaceResized, mDamagedRects, clippingRect); // Switch GL context // Render the surface mCore.RenderScene(windowRenderStatus, scene, false, clippingRect); -- 2.7.4