Add GetRenderTaskList to SceneHolder

Change-Id: I9261d97923f842859f088a97d529185b710bfe21

diff --git a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
index 31f0c36..7dbc5e1 100644 (file)
--- a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
+++ b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
@@ -27,6 +27,7 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/adaptor/common/adaptor-impl.h>
@@ -366,6 +367,11 @@ void SceneHolder::AddFramePresentedCallback(std::unique_ptr<CallbackBase> callba
   DALI_LOG_RELEASE_INFO("SceneHolder::AddFramePresentedCallback:: Added [%d]\n", frameId);
 }
 
+Dali::RenderTaskList SceneHolder::GetRenderTaskList() const
+{
+  return mScene.GetRenderTaskList();
+}
+
 Dali::Integration::SceneHolder SceneHolder::Get(Dali::Actor actor)
 {
   SceneHolder* sceneHolderImpl = nullptr;

diff --git a/dali/integration-api/adaptor-framework/scene-holder-impl.h b/dali/integration-api/adaptor-framework/scene-holder-impl.h
index 8cb30c3..f4b2216 100644 (file)
--- a/dali/integration-api/adaptor-framework/scene-holder-impl.h
+++ b/dali/integration-api/adaptor-framework/scene-holder-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTEGRATION_INTERNAL_SCENEHOLDER_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -236,6 +236,11 @@ public:
   void CreateRenderTarget();
 
   /**
+   * @copydoc Dali::Integration::SceneHolder::GetRenderTaskList()
+   */
+  Dali::RenderTaskList GetRenderTaskList() const;
+
+  /**
    * @copydoc Dali::Integration::SceneHolder::Get()
    */
   static Dali::Integration::SceneHolder Get(Dali::Actor actor);

diff --git a/dali/integration-api/adaptor-framework/scene-holder.cpp b/dali/integration-api/adaptor-framework/scene-holder.cpp
index 0fbf66e..33baa43 100644 (file)
--- a/dali/integration-api/adaptor-framework/scene-holder.cpp
+++ b/dali/integration-api/adaptor-framework/scene-holder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
 #include <dali/public-api/events/wheel-event.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
@@ -104,6 +105,11 @@ void SceneHolder::FeedKeyEvent(Dali::KeyEvent& keyEvent)
   GetImplementation(*this).FeedKeyEvent(event);
 }
 
+RenderTaskList SceneHolder::GetRenderTaskList()
+{
+  return GetImplementation(*this).GetRenderTaskList();
+}
+
 SceneHolder SceneHolder::Get(Actor actor)
 {
   return Internal::Adaptor::SceneHolder::Get(actor);

diff --git a/dali/integration-api/adaptor-framework/scene-holder.h b/dali/integration-api/adaptor-framework/scene-holder.h
index eed2515..20c8aba 100644 (file)
--- a/dali/integration-api/adaptor-framework/scene-holder.h
+++ b/dali/integration-api/adaptor-framework/scene-holder.h
@@ -2,7 +2,7 @@
 #define DALI_INTEGRATION_SCENEHOLDER_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ class TouchEvent;
 class WheelEvent;
 struct TouchPoint;
 class KeyEvent;
+class RenderTaskList;
 
 namespace Internal DALI_INTERNAL
 {
@@ -158,6 +159,12 @@ public:
   void FeedKeyEvent(Dali::KeyEvent& keyEvent);
 
   /**
+   * @brief Retrieves the list of render-tasks.
+   * @return A valid handle to a RenderTaskList
+   */
+  RenderTaskList GetRenderTaskList();
+
+  /**
    * @brief Retrieve the SceneHolder that the given actor is added to.
    *
    * @param[in] actor The actor

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index f1c4ac9..885a77f 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -28,8 +28,6 @@
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/window-enumerations.h>
-#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/public-api/render-tasks/render-task.h>
 #include <dali/public-api/rendering/frame-buffer.h>
 #include <thread>
 
@@ -326,11 +324,6 @@ Dali::Layer Window::GetLayer(uint32_t depth) const
   return mScene.GetLayer(depth);
 }
 
-Dali::RenderTaskList Window::GetRenderTaskList() const
-{
-  return mScene.GetRenderTaskList();
-}
-
 void Window::KeepRendering(float durationSeconds)
 {
   mScene.KeepRendering(durationSeconds);

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index 407e966..34ff1c9 100644 (file)
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -25,7 +25,6 @@
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/property-array.h>
 #include <dali/public-api/object/ref-object.h>
-#include <dali/public-api/render-tasks/render-task-list.h>
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/window-devel.h>
@@ -165,11 +164,6 @@ public:
   Dali::Layer GetLayer(uint32_t depth) const;
 
   /**
-   * @copydoc Dali::Window::GetRenderTaskList()
-   */
-  Dali::RenderTaskList GetRenderTaskList() const;
-
-  /**
    * @copydoc Dali::Window::KeepRendering()
    */
   void KeepRendering(float durationSeconds);

diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp
index 0e23346..5e49474 100644 (file)
--- a/dali/public-api/adaptor-framework/window.cpp
+++ b/dali/public-api/adaptor-framework/window.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/window-system/common/orientation-impl.h>