From 61a6b0e924dfe7688b02cf9d2878ba43ea60e14d Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 5 Jun 2023 17:51:24 +0900 Subject: [PATCH] [Tizen] Add GetRenderTaskList to SceneHolder Change-Id: I9261d97923f842859f088a97d529185b710bfe21 --- dali/integration-api/adaptor-framework/scene-holder-impl.cpp | 6 ++++++ dali/integration-api/adaptor-framework/scene-holder-impl.h | 7 ++++++- dali/integration-api/adaptor-framework/scene-holder.cpp | 8 +++++++- dali/integration-api/adaptor-framework/scene-holder.h | 9 ++++++++- dali/internal/window-system/common/window-impl.cpp | 7 ------- dali/internal/window-system/common/window-impl.h | 6 ------ dali/public-api/adaptor-framework/window.cpp | 1 + 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp index 24d88c1..32749aa 100644 --- 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 #include #include +#include // INTERNAL INCLUDES #include @@ -375,6 +376,11 @@ void SceneHolder::AddFramePresentedCallback(std::unique_ptr 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 --- 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 --- 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 #include #include +#include // INTERNAL INCLUDES #include @@ -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 --- 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 7e0a6ab..465aa12 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include @@ -324,11 +322,6 @@ Dali::Layer Window::GetLayer(uint32_t depth) const return mScene.GetLayer(depth); } -Dali::RenderTaskList Window::GetRenderTaskList() const -{ - return mScene.GetRenderTaskList(); -} - std::string Window::GetNativeResourceId() const { return mWindowBase->GetNativeWindowResourceId(); diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 089bcd8..eb2cd9b 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -25,7 +25,6 @@ #include #include #include -#include // INTERNAL INCLUDES #include @@ -166,11 +165,6 @@ public: Dali::Layer GetLayer(uint32_t depth) const; /** - * @copydoc Dali::DevelWindow::GetRenderTaskList() - */ - Dali::RenderTaskList GetRenderTaskList() const; - - /** * @brief Get window resource ID assigned by window manager * @return The resource ID of the window */ diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp index eb03a52..f33f7db 100644 --- a/dali/public-api/adaptor-framework/window.cpp +++ b/dali/public-api/adaptor-framework/window.cpp @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include -- 2.7.4