projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2a8bf0b
)
Revert "[Tizen] Update RenderState in PreRender"
author
huiyu.eun
<huiyu.eun@samsung.com>
Mon, 29 Nov 2021 07:51:32 +0000
(16:51 +0900)
committer
huiyu.eun
<huiyu.eun@samsung.com>
Mon, 29 Nov 2021 07:51:32 +0000
(16:51 +0900)
This reverts commit
4e6b015f967d860214ab1ef1edff5fe9c1ba8c45
.
automated-tests/src/dali/dali-test-suite-utils/test-application.cpp
patch
|
blob
|
history
dali/integration-api/core.cpp
patch
|
blob
|
history
dali/integration-api/core.h
patch
|
blob
|
history
dali/internal/common/core-impl.cpp
patch
|
blob
|
history
dali/internal/common/core-impl.h
patch
|
blob
|
history
dali/internal/render/common/render-manager.cpp
patch
|
blob
|
history
dali/internal/render/common/render-manager.h
patch
|
blob
|
history
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*/);
DoUpdate(intervalMilliseconds, location);
mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/);
- mCore->PreRender(m
RenderStatus, m
Scene, damagedRects);
+ mCore->PreRender(mScene, damagedRects);
return mStatus.KeepUpdating() || mRenderStatus.NeedsUpdate();
}
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);
}
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(s
tatus, s
cene, damagedRects);
+ mImpl->PreRender(scene, damagedRects);
}
void Core::RenderScene(RenderStatus& status, Integration::Scene& scene, bool renderToFbo)
}
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.
*/
* @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.
/**
* 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);
}
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(s
tatus, s
cene, damagedRects);
+ mRenderManager->PreRender(scene, damagedRects);
}
void Core::RenderScene(RenderStatus& status, Integration::Scene& scene, bool renderToFbo)
}
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()
*/
/**
* @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()
/**
* @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)
{
{
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
if(sceneObject->IsRenderingSkipped())
{
// We don't need to calculate dirty rects
- status.SetNeedsUpdate(false);
return;
}
return;
}
- status.SetNeedsUpdate(true);
-
class DamagedRectsCleaner
{
public:
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.
*/
* @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()
// This method should be called from Core::RenderScene()