Revert "[Tizen] Add OffscreenApplication"
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 24 Aug 2020 05:03:50 +0000 (14:03 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 24 Aug 2020 05:03:50 +0000 (14:03 +0900)
This reverts commit 188e912a5a3ea204093c4667783f956a69625542.

40 files changed:
build/tizen/module-list.cmake
build/tizen/profiles/android-profile.cmake
build/tizen/profiles/common-profile.cmake
build/tizen/profiles/ivi-profile.cmake
build/tizen/profiles/mobile-profile.cmake
build/tizen/profiles/tv-profile.cmake
build/tizen/profiles/ubuntu-profile.cmake
build/tizen/profiles/wearable-profile.cmake
build/tizen/profiles/windows-profile.cmake
dali/devel-api/adaptor-framework/offscreen-application.cpp [deleted file]
dali/devel-api/adaptor-framework/offscreen-application.h [deleted file]
dali/devel-api/adaptor-framework/offscreen-window.cpp [deleted file]
dali/devel-api/adaptor-framework/offscreen-window.h [deleted file]
dali/devel-api/file.list
dali/integration-api/adaptor-framework/native-render-surface.h
dali/internal/adaptor/common/adaptor-impl.cpp
dali/internal/adaptor/common/adaptor-impl.h
dali/internal/offscreen/android/offscreen-window-factory-android.cpp [deleted file]
dali/internal/offscreen/android/offscreen-window-factory-android.h [deleted file]
dali/internal/offscreen/android/offscreen-window-impl-android.cpp [deleted file]
dali/internal/offscreen/android/offscreen-window-impl-android.h [deleted file]
dali/internal/offscreen/common/offscreen-application-impl.cpp [deleted file]
dali/internal/offscreen/common/offscreen-application-impl.h [deleted file]
dali/internal/offscreen/common/offscreen-window-factory.h [deleted file]
dali/internal/offscreen/common/offscreen-window-impl.h [deleted file]
dali/internal/offscreen/file.list [deleted file]
dali/internal/offscreen/tizen/offscreen-window-factory-tizen.cpp [deleted file]
dali/internal/offscreen/tizen/offscreen-window-factory-tizen.h [deleted file]
dali/internal/offscreen/tizen/offscreen-window-impl-tizen.cpp [deleted file]
dali/internal/offscreen/tizen/offscreen-window-impl-tizen.h [deleted file]
dali/internal/offscreen/ubuntu-x11/offscreen-window-factory-x.cpp [deleted file]
dali/internal/offscreen/ubuntu-x11/offscreen-window-factory-x.h [deleted file]
dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.cpp [deleted file]
dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.h [deleted file]
dali/internal/offscreen/windows/offscreen-window-factory-win.cpp [deleted file]
dali/internal/offscreen/windows/offscreen-window-factory-win.h [deleted file]
dali/internal/offscreen/windows/offscreen-window-impl-win.cpp [deleted file]
dali/internal/offscreen/windows/offscreen-window-impl-win.h [deleted file]
dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h

index f779f50a82968d3d715eb640741649e04f412089..161d1de3492e89d40ca2bace3358bbacc076b315 100644 (file)
@@ -28,9 +28,6 @@ include( ${ADAPTOR_ROOT}/dali/internal/legacy/file.list )
 SET( adaptor_network_dir ${ADAPTOR_ROOT}/dali/internal/network )
 include( ${ADAPTOR_ROOT}/dali/internal/network/file.list )
 
-SET( adaptor_offscreen_dir ${ADAPTOR_ROOT}/dali/internal/offscreen )
-include( ${ADAPTOR_ROOT}/dali/internal/offscreen/file.list )
-
 SET( adaptor_sensor_dir ${ADAPTOR_ROOT}/dali/internal/sensor )
 include( ${ADAPTOR_ROOT}/dali/internal/sensor/file.list )
 
index d220b582e4931c647f7f5b28a94e0b457eaa87de..5862cec12fe544253815bf880c76885016fe1ceb 100644 (file)
@@ -24,8 +24,6 @@ SET( SOURCES
         ${adaptor_integration_api_android_src_files}
         ${adaptor_legacy_common_src_files}
         ${adaptor_network_common_src_files}
-        ${adaptor_offscreen_common_src_files}
-        ${adaptor_offscreen_android_src_files}
         ${adaptor_public_api_src_files}
         ${adaptor_sensor_common_src_files}
         ${adaptor_sensor_android_src_files}
index c47a3cf6fd0df0310fc2cc6b1209c123d1188576..e1afc1e47f3dbb729ede45aa296ab00775375bfe 100644 (file)
@@ -23,8 +23,6 @@ SET( SOURCES
     ${adaptor_integration_api_src_files}
     ${adaptor_legacy_common_src_files}
     ${adaptor_network_common_src_files}
-    ${adaptor_offscreen_common_src_files}
-    ${adaptor_offscreen_tizen_src_files}
     ${adaptor_public_api_src_files}
     ${adaptor_sensor_common_src_files}
     ${adaptor_sensor_tizen_src_files}
index 7ec48e6c3260c06cedecaff178fe132e03bc8cec..aebd8b633750dc7667bca9172b460f5ec32fcdd0 100644 (file)
@@ -24,8 +24,6 @@ SET( SOURCES
      ${adaptor_integration_api_src_files}
      ${adaptor_legacy_common_src_files}
      ${adaptor_network_common_src_files}
-     ${adaptor_offscreen_common_src_files}
-     ${adaptor_offscreen_tizen_src_files}
      ${adaptor_public_api_src_files}
      ${adaptor_sensor_common_src_files}
      ${adaptor_sensor_tizen_src_files}
index 6907af4aa5d0ab927e27e1b084bf99fd30eb3500..a53da274e82720a534c90c6a0c681b41bb87343e 100644 (file)
@@ -23,8 +23,6 @@ SET( SOURCES
         ${adaptor_integration_api_src_files}
         ${adaptor_legacy_common_src_files}
         ${adaptor_network_common_src_files}
-        ${adaptor_offscreen_common_src_files}
-        ${adaptor_offscreen_tizen_src_files}
         ${adaptor_public_api_src_files}
         ${adaptor_sensor_common_src_files}
         ${adaptor_sensor_tizen_src_files}
index 38a21eb4b6ee988efbeb89fa73d3fe119121a5a7..2469de7860b1cc610eff73dc905a8c705a6cf62d 100644 (file)
@@ -23,8 +23,6 @@ SET( SOURCES
     ${adaptor_integration_api_src_files}
     ${adaptor_legacy_common_src_files}
     ${adaptor_network_common_src_files}
-    ${adaptor_offscreen_common_src_files}
-    ${adaptor_offscreen_tizen_src_files}
     ${adaptor_public_api_src_files}
     ${adaptor_sensor_common_src_files}
     ${adaptor_sensor_tizen_src_files}
index 5f2c7d4ef52865f15cef3eba5057a516e51ecca7..82643fa29c943d60286fb2f70d73b407a0b46e4f 100644 (file)
@@ -22,8 +22,6 @@ SET( SOURCES
         ${adaptor_integration_api_src_files}
         ${adaptor_legacy_common_src_files}
         ${adaptor_network_common_src_files}
-        ${adaptor_offscreen_common_src_files}
-        ${adaptor_offscreen_ubuntu-x11_src_files}
         ${adaptor_public_api_src_files}
         ${adaptor_sensor_common_src_files}
         ${adaptor_sensor_ubuntu_src_files}
index 491f4a8a3acf132d1489ba17f51880220b076e0e..2a908d04860e3544a74188f75f54706d8432b1a8 100644 (file)
@@ -24,8 +24,6 @@ SET( SOURCES
     ${adaptor_integration_api_src_files}
     ${adaptor_legacy_common_src_files}
     ${adaptor_network_common_src_files}
-    ${adaptor_offscreen_common_src_files}
-    ${adaptor_offscreen_tizen_src_files}
     ${adaptor_public_api_src_files}
     ${adaptor_sensor_common_src_files}
     ${adaptor_sensor_tizen_src_files}
index b59fc6fb0113be07bd1961d327c168d801837c70..c39c3bdd615049b0136329bc3d21df80ce70ef1a 100644 (file)
@@ -17,8 +17,6 @@ SET( SOURCES
         ${adaptor_integration_api_src_files}
         ${adaptor_legacy_common_src_files}
         ${adaptor_network_common_src_files}
-        ${adaptor_offscreen_common_src_files}
-        ${adaptor_offscreen_windows_src_files}
         ${adaptor_public_api_src_files}
         ${adaptor_sensor_common_src_files}
         ${adaptor_styling_common_src_files}
diff --git a/dali/devel-api/adaptor-framework/offscreen-application.cpp b/dali/devel-api/adaptor-framework/offscreen-application.cpp
deleted file mode 100644 (file)
index f5a522c..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/devel-api/adaptor-framework/offscreen-application.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-application-impl.h>
-
-namespace Dali
-{
-OffscreenApplication OffscreenApplication::New( uint16_t width, uint16_t height, bool isTranslucent, OffscreenApplication::RenderMode renderMode )
-{
-  Dali::Any surface;
-  IntrusivePtr< Internal::OffscreenApplication > impl = Internal::OffscreenApplication::New( width, height, surface, isTranslucent, renderMode );
-
-  OffscreenApplication offscreenApplication = OffscreenApplication( impl.Get() );
-
-  return offscreenApplication;
-}
-
-OffscreenApplication OffscreenApplication::New( Dali::Any surface, bool isTranslucent, OffscreenApplication::RenderMode renderMode )
-{
-  IntrusivePtr< Internal::OffscreenApplication > impl = Internal::OffscreenApplication::New( 0, 0, surface, isTranslucent, renderMode );
-
-  OffscreenApplication offscreenApplication = OffscreenApplication( impl.Get() );
-
-  return offscreenApplication;
-}
-
-OffscreenApplication::OffscreenApplication()
-{
-}
-
-OffscreenApplication::OffscreenApplication( const OffscreenApplication& offscreenApplication )
-: BaseHandle( offscreenApplication )
-{
-}
-
-OffscreenApplication& OffscreenApplication::operator=( const OffscreenApplication& offscreenApplication )
-{
-  if( *this != offscreenApplication )
-  {
-    BaseHandle::operator=( offscreenApplication );
-  }
-  return *this;
-}
-
-OffscreenApplication::~OffscreenApplication()
-{
-}
-
-void OffscreenApplication::Start()
-{
-  Internal::GetImplementation( *this ).Start();
-}
-
-void OffscreenApplication::Stop()
-{
-  Internal::GetImplementation( *this ).Stop();
-}
-
-Dali::OffscreenWindow OffscreenApplication::GetWindow()
-{
-  return Internal::GetImplementation( *this ).GetWindow();
-}
-
-void OffscreenApplication::RenderOnce()
-{
-  Internal::GetImplementation( *this ).RenderOnce();
-}
-
-OffscreenApplication::OffscreenApplicationSignalType& OffscreenApplication::InitSignal()
-{
-  return Internal::GetImplementation( *this ).InitSignal();
-}
-
-OffscreenApplication::OffscreenApplicationSignalType& OffscreenApplication::TerminateSignal()
-{
-  return Internal::GetImplementation( *this ).TerminateSignal();
-}
-
-OffscreenApplication::OffscreenApplication( Internal::OffscreenApplication* offscreenApplication )
-: BaseHandle( offscreenApplication )
-{
-}
-
-}  // namespace Dali
diff --git a/dali/devel-api/adaptor-framework/offscreen-application.h b/dali/devel-api/adaptor-framework/offscreen-application.h
deleted file mode 100644 (file)
index dd5eacb..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef DALI_OFFSCREEN_APPLICATION_H
-#define DALI_OFFSCREEN_APPLICATION_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/signals/dali-signal.h>
-#include <dali/public-api/object/any.h>
-#include <dali/public-api/object/base-handle.h>
-
-namespace Dali
-{
-
-/**
- * @addtogroup dali_adaptor_framework
- * @{
- */
-
-class OffscreenWindow;
-
-namespace Internal
-{
-class OffscreenApplication;
-}
-
-/**
- * @brief Appliations can draw UI on offscreen surface with the OffscreenApplication.
- * When you use a OffscreenApplication, you don't have to create a Window.
- */
-class DALI_IMPORT_API OffscreenApplication : public Dali::BaseHandle
-{
-public:
-
-  enum class RenderMode
-  {
-    AUTO,         // UI is rendered automatically
-    MANUAL        // UI is rendered by RenderOnce()
-  };
-
-  typedef Signal<void (void)> OffscreenApplicationSignalType;
-
-public:
-
-  /**
-   * @brief This is the constructor of OffscreenApplication
-   *
-   * @param[in] width The initial width of the default OffscreenWindow
-   * @param[in] height The initial height of the default OffscreenWindow
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   * @param[in] renderMode The RenderMode of the OffscreenApplication
-   */
-  static OffscreenApplication New( uint16_t width, uint16_t height, bool isTranslucent,
-                                   RenderMode renderMode = RenderMode::AUTO );
-
-  /**
-   * @brief This is the constructor of OffscreenApplication
-   *
-   * @param[in] surface The native surface handle to create the OffscreenWindow
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   * @param[in] renderMode The RenderMode of the OffscreenApplication
-   */
-  static OffscreenApplication New( Dali::Any surface, bool isTranslucent,
-                                   RenderMode renderMode = RenderMode::AUTO );
-
-  /**
-   * @brief Constructs an empty handle
-   */
-  OffscreenApplication();
-
-  /**
-   * @brief Copy constructor
-   */
-  OffscreenApplication( const OffscreenApplication& offscreenApplication );
-
-  /**
-   * @brief Assignment operator
-   */
-  OffscreenApplication& operator=( const OffscreenApplication& offscreenApplication );
-
-  /**
-   * @brief Destructor
-   */
-  ~OffscreenApplication();
-
-public:
-
-  /**
-   * @brief Starts the OffscreenApplication (rendering, event handling, etc)
-   */
-  void Start();
-
-  /**
-   * @brief Stops the OffscreenApplication
-   */
-  void Stop();
-
-
-  /**
-   * @brief Get the default Window handle
-   * @return The default Window
-   */
-  OffscreenWindow GetWindow();
-
-  /**
-   * @brief Renders once more even if we're paused
-   */
-  void RenderOnce();
-
-public:  // Signals
-
-  /**
-   * @brief Signal to notify the client when the application is ready to be initialized
-   *
-   * @note OffscreenApplication::Start() should be called to be initialized
-   *
-   * @return The signal
-   */
- OffscreenApplicationSignalType& InitSignal();
-
-  /**
-   * @brief Signal to notify the user when the application is about to be terminated
-   *
-   * @return The signal
-   */
- OffscreenApplicationSignalType& TerminateSignal();
-
-public: // Not intended for application developers
-  /**
-   * @brief Internal constructor
-   */
-  explicit DALI_INTERNAL OffscreenApplication( Internal::OffscreenApplication* offscreenApplication );
-
-};
-
-/**
- * @}
- */
-
-}  // namespace Dali
-
-#endif // DALI_OFFSCREEN_APPLICATION_H
diff --git a/dali/devel-api/adaptor-framework/offscreen-window.cpp b/dali/devel-api/adaptor-framework/offscreen-window.cpp
deleted file mode 100644 (file)
index ab024a7..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTENRAL INCLUDES
-#include <dali/public-api/actors/layer.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-application-impl.h>
-#include <dali/internal/offscreen/common/offscreen-window-impl.h>
-#include <dali/internal/offscreen/common/offscreen-window-factory.h>
-
-// CLASS HEADER
-#include <dali/devel-api/adaptor-framework/offscreen-window.h>
-
-namespace Dali
-{
-OffscreenWindow OffscreenWindow::New( uint16_t width, uint16_t height, bool isTranslucent )
-{
-  auto windowFactory = Dali::Internal::GetOffscreenWindowFactory();
-  Any surface;
-  IntrusivePtr < Internal::OffscreenWindow > impl = windowFactory->CreateOffscreenWindow( width, height, surface, isTranslucent ).release();
-  OffscreenWindow window = OffscreenWindow( impl.Get() );
-  impl->Initialize( false );
-
-  return window;
-}
-
-OffscreenWindow OffscreenWindow::New( Any surface, bool isTranslucent )
-{
-  auto windowFactory = Dali::Internal::GetOffscreenWindowFactory();
-  IntrusivePtr < Internal::OffscreenWindow > impl = windowFactory->CreateOffscreenWindow( 0, 0, surface, isTranslucent ).release();
-  OffscreenWindow window = OffscreenWindow( impl.Get() );
-  impl->Initialize( false );
-
-  return window;
-}
-
-OffscreenWindow::OffscreenWindow()
-{
-}
-
-OffscreenWindow::OffscreenWindow( const OffscreenWindow& window )
-: BaseHandle( window )
-{
-}
-
-OffscreenWindow& OffscreenWindow::operator=( const OffscreenWindow& window )
-{
-  if( *this != window )
-  {
-    BaseHandle::operator=( window );
-  }
-  return *this;
-}
-
-OffscreenWindow::~OffscreenWindow()
-{
-}
-
-void OffscreenWindow::Add( Actor actor )
-{
-  Internal::GetImplementation( *this ).Add( actor );
-}
-
-void OffscreenWindow::Remove( Actor actor )
-{
-  Internal::GetImplementation( *this ).Remove( actor );
-}
-
-void OffscreenWindow::SetBackgroundColor( const Vector4& color )
-{
-  Internal::GetImplementation( *this ).SetBackgroundColor( color );
-}
-
-Vector4 OffscreenWindow::GetBackgroundColor() const
-{
-  return Internal::GetImplementation( *this ).GetBackgroundColor();
-}
-
-Layer OffscreenWindow::GetRootLayer() const
-{
-  return Internal::GetImplementation( *this ).GetRootLayer();
-}
-
-uint32_t OffscreenWindow::GetLayerCount() const
-{
-  return Internal::GetImplementation( *this ).GetLayerCount();
-}
-
-Layer OffscreenWindow::GetLayer( uint32_t depth ) const
-{
-  return Internal::GetImplementation( *this ).GetLayer( depth );
-}
-
-OffscreenWindow::WindowSize OffscreenWindow::GetSize() const
-{
-  return Internal::GetImplementation( *this ).GetSize();
-}
-
-Any OffscreenWindow::GetNativeHandle() const
-{
-  return Internal::GetImplementation( *this ).GetNativeHandle();
-}
-
-OffscreenWindow::PostRenderSignalType& OffscreenWindow::PostRenderSignal()
-{
-  return Internal::GetImplementation( *this ).PostRenderSignal();
-}
-
-
-OffscreenWindow::OffscreenWindow( Internal::OffscreenWindow* window )
-: BaseHandle( window )
-{
-}
-
-}  // namespace Dali
diff --git a/dali/devel-api/adaptor-framework/offscreen-window.h b/dali/devel-api/adaptor-framework/offscreen-window.h
deleted file mode 100644 (file)
index bb279cb..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-#ifndef DALI_OFFSCREEN_WINDOW_H
-#define DALI_OFFSCREEN_WINDOW_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <memory>
-#include <dali/public-api/actors/actor.h>
-#include <dali/public-api/math/uint-16-pair.h>
-#include <dali/public-api/signals/dali-signal.h>
-#include <dali/public-api/object/any.h>
-
-// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/offscreen-application.h>
-
-namespace Dali
-{
-
-/**
- * @addtogroup dali_adaptor_framework
- * @{
- */
-
-class Layer;
-
-namespace Internal
-{
-class OffscreenWindow;
-}
-
-class DALI_IMPORT_API OffscreenWindow : public Dali::BaseHandle
-{
-public:
-
-  typedef Uint16Pair WindowSize;
-  typedef Signal<void (OffscreenWindow, Any)> PostRenderSignalType;
-
-public:
-
-  /**
-   * @brief Creates an initialized handle to a new OffscreenWindow
-   * @note You should hold the returned handle. If you missed the handle, the OffscreenWindow will be released
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  static OffscreenWindow New( uint16_t width, uint16_t height, bool isTranslucent );
-
-  /**
-   * @brief Creates an initialized handle to a new OffscreenWindow
-   * @note You should hold the returned handle. If you missed the handle, the OffscreenWindow will be released
-   *
-   * @param[in] surface The native surface handle of your platform
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  static OffscreenWindow New( Any surface, bool isTranslucent );
-
-  /**
-   * @brief Constructs an empty handle
-   */
-  OffscreenWindow();
-
-  /**
-   * @brief Copy constructor
-   */
-  OffscreenWindow( const OffscreenWindow& window );
-
-  /**
-   * @brief Assignment operator
-   */
-  OffscreenWindow& operator=( const OffscreenWindow& window );
-
-  /**
-   * @brief Destructor
-   */
-  ~OffscreenWindow();
-
-public:
-  /**
-   * @brief Adds a child Actor to the OffscreenWindow.
-   *
-   * The child will be referenced.
-   *
-   * @param[in] actor The child
-   * @pre The actor has been initialized.
-   * @pre The actor does not have a parent.
-   */
-  void Add( Actor actor );
-
-  /**
-   * @brief Removes a child Actor from the OffscreenWindow.
-   *
-   * The child will be unreferenced.
-   *
-   * @param[in] actor The child
-   * @pre The actor has been added to the OffscreenWindow.
-   */
-  void Remove( Actor actor );
-
-  /**
-   * @brief Sets the background color of the OffscreenWindow.
-   *
-   * @param[in] color The new background color
-   */
-  void SetBackgroundColor( const Vector4& color );
-
-  /**
-   * @brief Gets the background color of the OffscreenWindow.
-   *
-   * @return The background color
-   */
-  Vector4 GetBackgroundColor() const;
-
-  /**
-   * @brief Returns the root Layer of the OffscreenWindow.
-   *
-   * @return The root layer
-   */
-  Layer GetRootLayer() const;
-
-  /**
-   * @brief Queries the number of on-scene layers.
-   *
-   * Note that a default layer is always provided (count >= 1).
-   *
-   * @return The number of layers
-   */
-  uint32_t GetLayerCount() const;
-
-  /**
-   * @brief Retrieves the layer at a specified depth in the OffscreenWindow.
-   *
-   * @param[in] depth The depth
-   * @return The layer found at the given depth
-   * @pre Depth is less than layer count; see GetLayerCount().
-   */
-  Layer GetLayer( uint32_t depth ) const;
-
-  /**
-   * @brief Returns the size of the OffscreenWindow in pixels as a Vector.
-   *
-   * The x component will be the width of the OffscreenWindow in pixels.
-   * The y component will be the height of the OffscreenWindow in pixels.
-   *
-   * @return The size of the OffscreenWindow as a Vector
-   */
-  WindowSize GetSize() const;
-
-  /**
-   * @brief Gets the native handle.
-   * @note When users call this function, it wraps the actual type used by the underlying system.
-   * @return The native handle or an empty handle
-   */
-  Any GetNativeHandle() const;
-
-public:  // Signals
-
-  /**
-   * @brief This signal is emitted when the OffscreenWindow is rendered.
-   *
-   * @return The signal
-   */
-  PostRenderSignalType& PostRenderSignal();
-
-public: // Not intended for application developers
-
-  /**
-   * @brief Internal constructor
-   */
-  explicit DALI_INTERNAL OffscreenWindow( Internal::OffscreenWindow* window );
-
-};
-
-/**
- * @}
- */
-
-}  // namespace Dali
-
-#endif // DALI_OFFSCREEN_WINDOW_H
index 717cba99b3fc9a462843959ee42852525c3b456f..7c404a0c0c02754f9ff69f5b5a999e03382ef502 100755 (executable)
@@ -37,8 +37,6 @@ SET( devel_api_src_files
   ${adaptor_devel_api_dir}/adaptor-framework/thread-settings.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/web-engine.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/window-devel.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/offscreen-application.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/offscreen-window.cpp
 )
 
 
@@ -94,8 +92,6 @@ SET( devel_api_adaptor_framework_header_files
   ${adaptor_devel_api_dir}/adaptor-framework/window-devel.h
   ${adaptor_devel_api_dir}/adaptor-framework/component-application.h
   ${adaptor_devel_api_dir}/adaptor-framework/video-sync-mode.h
-  ${adaptor_devel_api_dir}/adaptor-framework/offscreen-application.h
-  ${adaptor_devel_api_dir}/adaptor-framework/offscreen-window.h
 )
 
 
index 1efcfb3b33446fbd790c1de602814f4864d793a9..4d4ef3728194b9b196767204eae026718b2e264f 100644 (file)
@@ -64,12 +64,6 @@ public: // API
    */
   virtual void WaitUntilSurfaceReplaced() = 0;
 
-  /**
-   * @brief Get the native surface handle
-   * @return The native surface handle
-   */
-  virtual Any GetNativeHandle() = 0;
-
 private: // from NativeRenderSurface
 
   /**
index 170dd127357a42a6213bdf8f85f5fc5914392677..b5980792dc70a5a8e1c58ec2fd7784d5d08b73fc 100644 (file)
@@ -95,10 +95,10 @@ thread_local Adaptor* gThreadLocalAdaptor = NULL; // raw thread specific pointer
 
 } // unnamed namespace
 
-Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions, ThreadMode threadMode )
+Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions )
 {
   Dali::Adaptor* adaptor = new Dali::Adaptor;
-  Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions, threadMode );
+  Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions );
   adaptor->mImpl = impl;
 
   Dali::Internal::Adaptor::AdaptorBuilder* mAdaptorBuilder = new AdaptorBuilder();
@@ -110,13 +110,6 @@ Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::Render
   return adaptor;
 }
 
-Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions )
-{
-  Dali::Adaptor* adaptor = New( window, surface, configuration, environmentOptions, ThreadMode::NORMAL );
-
-  return adaptor;
-}
-
 Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions )
 {
   Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( window );
@@ -125,21 +118,14 @@ Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::Config
   return adaptor;
 }
 
-Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions, ThreadMode threadMode )
+Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions )
 {
   Dali::Adaptor* adaptor = new Dali::Adaptor; // Public adaptor
-  Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions, threadMode ); // Impl adaptor
+  Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions ); // Impl adaptor
   adaptor->mImpl = impl;
 
   impl->Initialize( graphicsFactory, configuration );
 
-  return adaptor;
-}
-
-Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions )
-{
-  Dali::Adaptor* adaptor = New( graphicsFactory, window, surface, configuration, environmentOptions, ThreadMode::NORMAL );
-
   return adaptor;
 } // Called second
 
@@ -1187,7 +1173,7 @@ Dali::ObjectRegistry Adaptor::GetObjectRegistry() const
   return registry;
 }
 
-Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions, ThreadMode threadMode )
+Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions)
 : mResizedSignal(),
   mLanguageChangedSignal(),
   mWindowCreatedSignal(),
@@ -1213,7 +1199,7 @@ Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor,
   mSystemTracer(),
   mObjectProfiler( nullptr ),
   mSocketFactory(),
-  mThreadMode( threadMode ),
+  mThreadMode( ThreadMode::NORMAL ),
   mEnvironmentOptionsOwned( environmentOptions ? false : true /* If not provided then we own the object */ ),
   mUseRemoteSurface( false )
 {
index f23d2a4e5581c4700f8036ee47f4331ccd3423fa..7cb94ddbce6d9a9706c3c864abc2fccbc24feb48 100644 (file)
@@ -94,22 +94,6 @@ public:
 
   using SurfaceSize = Uint16Pair;          ///< Surface size type
 
-  /**
-   * Creates a New Adaptor
-   * @param[in]  window              The window handle
-   * @param[in]  surface             A render surface can be one of the following
-   *                                  - Pixmap, adaptor will use existing Pixmap to draw on to
-   *                                  - Window, adaptor will use existing Window to draw on to
-   * @param[in]  configuration       The context loss configuration ( to choose resource discard policy )
-   * @param[in]  environmentOptions  A pointer to the environment options. If NULL then one is created.
-   * @param[in]  threadMode          The mode of the Adaptor
-   */
-  static Dali::Adaptor* New( Dali::Integration::SceneHolder window,
-                             Dali::RenderSurfaceInterface* surface,
-                             Dali::Configuration::ContextLoss configuration,
-                             EnvironmentOptions* environmentOptions,
-                             ThreadMode threadMode );
-
   /**
    * Creates a New Adaptor
    * @param[in]  window              The window handle
@@ -134,24 +118,6 @@ public:
                              Dali::Configuration::ContextLoss configuration,
                              EnvironmentOptions* environmentOptions );
 
-  /**
-   * Creates a New Adaptor
-   * @param[in]  graphicsFactory     A factory that creates the graphics interface
-   * @param[in]  window              The window handle
-   * @param[in]  surface             A render surface can be one of the following
-   *                                  - Pixmap, adaptor will use existing Pixmap to draw on to
-   *                                  - Window, adaptor will use existing Window to draw on to
-   * @param[in]  configuration       The context loss configuration ( to choose resource discard policy )
-   * @param[in]  environmentOptions  A pointer to the environment options. If NULL then one is created.
-   * @param[in]  threadMode          The ThreadMode of the Adaptor
-   */
-  static Dali::Adaptor* New( GraphicsFactory& graphicsFactory,
-                             Dali::Integration::SceneHolder window,
-                             Dali::RenderSurfaceInterface* surface,
-                             Dali::Configuration::ContextLoss configuration,
-                             EnvironmentOptions* environmentOptions,
-                             ThreadMode threadMode );
-
   /**
    * Creates a New Adaptor
    * @param[in]  graphicsFactory     A factory that creates the graphics interface
@@ -673,9 +639,8 @@ private:
    *                          - Pixmap, adaptor will use existing Pixmap to draw on to
    *                          - Window, adaptor will use existing Window to draw on to
    * @param[in]  environmentOptions  A pointer to the environment options. If NULL then one is created.
-   * @param[in]  threadMode   The ThreadMode of the Adaptor
    */
-  Adaptor( Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions, ThreadMode threadMode );
+  Adaptor( Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions );
 
 private: // Types
 
diff --git a/dali/internal/offscreen/android/offscreen-window-factory-android.cpp b/dali/internal/offscreen/android/offscreen-window-factory-android.cpp
deleted file mode 100644 (file)
index 0d851ca..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/offscreen/android/offscreen-window-factory-android.h>
-
-// INTERNAL HEADERS
-#include <dali/internal/offscreen/android/offscreen-window-impl-android.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-std::unique_ptr< OffscreenWindow > OffscreenWindowFactoryAndroid::CreateOffscreenWindow( uint16_t width, uint16_t height, Any surface, bool isTranslucent )
-{
-  return std::unique_ptr< OffscreenWindow >( OffscreenWindowAndroid::New( width, height, surface, isTranslucent ) );
-}
-
-std::unique_ptr< OffscreenWindowFactory > GetOffscreenWindowFactory()
-{
-  return std::unique_ptr< OffscreenWindowFactoryAndroid >( new OffscreenWindowFactoryAndroid() );
-}
-
-} // Internal
-} // Dali
diff --git a/dali/internal/offscreen/android/offscreen-window-factory-android.h b/dali/internal/offscreen/android/offscreen-window-factory-android.h
deleted file mode 100644 (file)
index f45b91c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_ANDROID_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_ANDROID_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-factory.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-class OffscreenWindowFactoryAndroid : public OffscreenWindowFactory
-{
-public:
-
-  /**
-   * @brief Create a new OffscreenWindow
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  std::unique_ptr< OffscreenWindow > CreateOffscreenWindow( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent ) override;
-};
-
-} // Internal
-} // Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_ANDROID_H
diff --git a/dali/internal/offscreen/android/offscreen-window-impl-android.cpp b/dali/internal/offscreen/android/offscreen-window-impl-android.cpp
deleted file mode 100644 (file)
index 9cf8480..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/layer.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-application-impl.h>
-
-// CLASS HEADER
-#include <dali/internal/offscreen/android/offscreen-window-impl-android.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-OffscreenWindowAndroid* OffscreenWindowAndroid::New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-{
-  OffscreenWindowAndroid* window = new OffscreenWindowAndroid( width, height, surface, isTranslucent );
-  return window;
-}
-
-OffscreenWindowAndroid::OffscreenWindowAndroid( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-: mIsTranslucent( isTranslucent )
-{
-}
-
-void OffscreenWindowAndroid::Initialize( bool isDefaultWindow )
-{
-}
-
-void OffscreenWindowAndroid::Initialize()
-{
-}
-
-OffscreenWindowAndroid::~OffscreenWindowAndroid()
-{
-}
-
-uint32_t OffscreenWindowAndroid::GetLayerCount() const
-{
-  return 0;
-}
-
-Dali::Layer OffscreenWindowAndroid::GetLayer( uint32_t depth ) const
-{
-  return Dali::Layer();
-}
-
-OffscreenWindow::WindowSize OffscreenWindowAndroid::GetSize() const
-{
-  return OffscreenWindow::WindowSize();
-}
-
-Dali::Any OffscreenWindowAndroid::GetNativeHandle() const
-{
-  return Any();
-}
-
-NativeRenderSurface* OffscreenWindowAndroid::GetNativeRenderSurface() const
-{
-  return nullptr;
-}
-
-void OffscreenWindowAndroid::OnPostRender()
-{
-}
-
-OffscreenWindow::PostRenderSignalType& OffscreenWindowAndroid::PostRenderSignal()
-{
-  return mPostRenderSignal;
-}
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/offscreen/android/offscreen-window-impl-android.h b/dali/internal/offscreen/android/offscreen-window-impl-android.h
deleted file mode 100644 (file)
index 10bcfa5..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_ANDROID_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_ANDROID_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-impl.h>
-
-namespace Dali
-{
-class Adaptor;
-class Layer;
-class NativeRenderSurface;
-class TriggerEventInterface;
-
-namespace Internal
-{
-
-class OffscreenWindowAndroid : public Dali::Internal::OffscreenWindow
-{
-public:
-
-  static OffscreenWindowAndroid* New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-public:
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayerCount
-   */
-  uint32_t GetLayerCount() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayer
-   */
-  Dali::Layer GetLayer( uint32_t depth ) const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetSize
-   */
-  WindowSize GetSize() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetNativeHandle
-   */
-  Dali::Any GetNativeHandle() const override;
-
-  /*
-   * @brief Initialize the OffscreenWindow
-   * @param[in] isDefaultWindow Whether the OffscreenWindow is a default one or not
-   */
-  void Initialize( bool isDefaultWindow );
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::OffscreenWindow::PostRenderSignal
-   */
-  OffscreenWindow::PostRenderSignalType& PostRenderSignal();
-
-private:
-  /**
-   * This function is called after drawing by dali.
-   */
-  void OnPostRender();
-
-  /**
-   * @brief Get the native render surface
-   * @return The render surface
-   */
-  NativeRenderSurface* GetNativeRenderSurface() const;
-
-private:
-
-  /**
-   * Private constructor
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  OffscreenWindowAndroid( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-  /**
-   * Destructor
-   */
-  virtual ~OffscreenWindowAndroid();
-
-  // Undefined
-  OffscreenWindowAndroid( const OffscreenWindowAndroid& );
-  OffscreenWindowAndroid& operator=( OffscreenWindowAndroid& );
-
-  /*
-   * @brief Initialize the OffscreenWindow (for internal use)
-   */
-  void Initialize();
-
-private:
-
-  PostRenderSignalType                      mPostRenderSignal;
-  bool                                      mIsTranslucent;
-};
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_ANDROID_H
diff --git a/dali/internal/offscreen/common/offscreen-application-impl.cpp b/dali/internal/offscreen/common/offscreen-application-impl.cpp
deleted file mode 100644 (file)
index f2a9ed1..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-#include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/integration-api/adaptor-framework/native-render-surface.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-impl.h>
-#include <dali/internal/offscreen/common/offscreen-window-factory.h>
-#include <dali/internal/adaptor/common/thread-controller-interface.h>
-
-// CLASS HEADER
-#include <dali/internal/offscreen/common/offscreen-application-impl.h>
-
-using Dali::Internal::Adaptor::ThreadMode;
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-IntrusivePtr< OffscreenApplication > OffscreenApplication::New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, RenderMode renderMode )
-{
-  IntrusivePtr< OffscreenApplication > offscreenApplication = new OffscreenApplication( width, height, surface, isTranslucent, renderMode );
-  return offscreenApplication;
-}
-
-OffscreenApplication::OffscreenApplication( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, RenderMode renderMode )
-{
-  // Generate a default window
-  auto windowFactory = Dali::Internal::GetOffscreenWindowFactory();
-  IntrusivePtr <Internal::OffscreenWindow > windowPtr = windowFactory->CreateOffscreenWindow( width, height, surface, isTranslucent ).release();
-  mDefaultWindow = Dali::OffscreenWindow( windowPtr.Get() );
-
-  mAdaptor = Dali::Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( windowPtr.Get() ), windowPtr->GetSurface(),
-                            Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS, NULL,
-                            renderMode == RenderMode::AUTO ? ThreadMode::NORMAL : ThreadMode::RUN_IF_REQUESTED );
-
-  // Initialize default window
-  windowPtr->Initialize( true );
-}
-
-OffscreenApplication::~OffscreenApplication()
-{
-  delete mAdaptor;
-  mAdaptor = nullptr;
-}
-
-void OffscreenApplication::Start()
-{
-   // Start the adaptor
-   mAdaptor->Start();
-   mInitSignal.Emit();
-   mAdaptor->NotifySceneCreated();
-}
-
-void OffscreenApplication::Stop()
-{
-  // Stop the adaptor
-  mAdaptor->Stop();
-  mTerminateSignal.Emit();
-}
-
-Dali::OffscreenWindow OffscreenApplication::GetWindow()
-{
-  return mDefaultWindow;
-}
-
-void OffscreenApplication::RenderOnce()
-{
-  mAdaptor->RenderOnce();
-}
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/offscreen/common/offscreen-application-impl.h b/dali/internal/offscreen/common/offscreen-application-impl.h
deleted file mode 100644 (file)
index 2fcada4..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_APPLICATION_IMPL_H
-#define DALI_INTERNAL_OFFSCREEN_APPLICATION_IMPL_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <memory>
-
-#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
-#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/connection-tracker.h>
-
-// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/offscreen-application.h>
-#include <dali/devel-api/adaptor-framework/offscreen-window.h>
-
-using RenderMode = Dali::OffscreenApplication::RenderMode;
-
-namespace Dali
-{
-class Adaptor;
-
-namespace Internal
-{
-
-/**
- * Implementation of the OffscreenApplication class.
- */
-class OffscreenApplication : public BaseObject,
-                   public ConnectionTracker
-{
-public:
-
-  typedef Dali::OffscreenApplication::OffscreenApplicationSignalType OffscreenApplicationSignalType;
-
-  /**
-   * @brief Create a new OffscreenApplication
-   * @param[in] width The width of the default OffscreenWindow
-   * @param[in] height The height of the default OffscreenWindow
-   * @param[in] surface The native surface handle to create the default OffscreenWindow
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  static IntrusivePtr<OffscreenApplication> New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, RenderMode renderMode);
-
-public:
-
-  /**
-   * @copydoc Dali::OffscreenApplication::Start()
-   */
-  void Start();
-
-  /**
-   * @copydoc Dali::OffscreenApplication::Stop()
-   */
-  void Stop();
-
-  /**
-   * @copydoc Dali::OffscreenApplication::GetDefaultWindow()
-   */
-  Dali::OffscreenWindow GetWindow();
-
-  /**
-   * @copydoc Dali::OffscreenApplication::RenderOnce()
-   */
-  void RenderOnce();
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::OffscreenApplication::InitSignal()
-   */
-  OffscreenApplicationSignalType& InitSignal()
-  {
-    return mInitSignal;
-  }
-
-  /**
-   * @copydoc Dali::OffscreenApplication::TerminateSignal()
-   */
-  OffscreenApplicationSignalType& TerminateSignal()
-  {
-    return mTerminateSignal;
-  }
-
-private:
-  /**
-   * Private constructor
-   * @param[in] width The width of the OffscreenWindow
-   * @param[in] height The height of the OffscreenApplication
-   * @param[in] surface The native surface handle to create the default OffscreenWindow
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  OffscreenApplication( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, RenderMode renderMode );
-
-
-  /**
-   * Destructor
-   */
-  virtual ~OffscreenApplication();
-
-  // Undefined
-  OffscreenApplication( const OffscreenApplication& );
-  OffscreenApplication& operator=( OffscreenApplication& );
-
-private:
-  Dali::Adaptor*                           mAdaptor;
-  Dali::OffscreenWindow                     mDefaultWindow;
-
-  OffscreenApplicationSignalType              mInitSignal;
-  OffscreenApplicationSignalType              mTerminateSignal;
-};
-
-inline OffscreenApplication& GetImplementation( Dali::OffscreenApplication& offscreenApplication )
-{
-  DALI_ASSERT_ALWAYS( offscreenApplication && "OffscreenApplication handle is empty" );
-
-  BaseObject& handle = offscreenApplication.GetBaseObject();
-
-  return static_cast<OffscreenApplication&>( handle );
-}
-
-inline const OffscreenApplication& GetImplementation( const Dali::OffscreenApplication& offscreenApplication )
-{
-  DALI_ASSERT_ALWAYS( offscreenApplication && "OffscreenApplication handle is empty" );
-
-  const BaseObject& handle = offscreenApplication.GetBaseObject();
-
-  return static_cast<const OffscreenApplication&>( handle );
-}
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_APPLICATION_IMPL_H
diff --git a/dali/internal/offscreen/common/offscreen-window-factory.h b/dali/internal/offscreen/common/offscreen-window-factory.h
deleted file mode 100644 (file)
index 9e90db5..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef DALI_OFFSCREEN_WINDOW_FACTORY_H
-#define DALI_OFFSCREEN_WINDOW_FACTORY_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/offscreen-window.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-class OffscreenWindow;
-
-class OffscreenWindowFactory
-{
-public:
-
-  OffscreenWindowFactory() = default;
-  virtual ~OffscreenWindowFactory() = default;
-
-  /**
-   * @brief Create a new OffscreenWindow
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The native surface handle of your platform
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  virtual std::unique_ptr< OffscreenWindow > CreateOffscreenWindow( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent ) = 0;
-};
-
-extern std::unique_ptr< OffscreenWindowFactory > GetOffscreenWindowFactory();
-
-} // Internal
-} // Dali
-
-#endif // DALI_OFFSCREEN_WINDOW_FACTORY_H
diff --git a/dali/internal/offscreen/common/offscreen-window-impl.h b/dali/internal/offscreen/common/offscreen-window-impl.h
deleted file mode 100644 (file)
index 43b623d..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <memory>
-#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
-#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/public-api/signals/connection-tracker.h>
-
-// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/offscreen-window.h>
-
-namespace Dali
-{
-class Adaptor;
-class Layer;
-class NativeRenderSurface;
-
-namespace Internal
-{
-
-/**
- * Implementation of the OffscreenWindow class.
- */
-class OffscreenWindow : public Dali::Internal::Adaptor::SceneHolder,
-                       public ConnectionTracker
-{
-public:
-  using WindowSize =  Dali::OffscreenWindow::WindowSize;
-  using PostRenderSignalType = Dali::OffscreenWindow::PostRenderSignalType;
-
-  /**
-   * @brief Create a new OffscreenWindow
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The native surface handle of your platform
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  static OffscreenWindow* New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-  OffscreenWindow() = default;
-
-public:
-
-  /**
-   * Destructor
-   */
-  ~OffscreenWindow() = default;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayerCount
-   */
-  virtual uint32_t GetLayerCount() const = 0;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayer
-   */
-  virtual Dali::Layer GetLayer( uint32_t depth ) const= 0;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetSize
-   */
-  virtual WindowSize GetSize() const= 0;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetNativeHandle
-   */
-  virtual Any GetNativeHandle() const override = 0;
-
-  /*
-   * @brief Initialize the OffscreenWindow
-   * @param[in] isDefaultWindow Whether the OffscreenWindow is a default one or not
-   */
-  virtual void Initialize( bool isDefaultWindow ) = 0;
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::OffscreenWindow::PostRenderSignal
-   */
-  virtual PostRenderSignalType& PostRenderSignal() = 0;
-
-private:
-  /**
-   * This function is called after drawing by dali.
-   */
-  virtual void OnPostRender() = 0;
-
-  /**
-   * @brief Get the native render surface
-   * @return The render surface
-   */
-  virtual NativeRenderSurface* GetNativeRenderSurface() const = 0;
-
-private:
-
-  // Undefined
-  OffscreenWindow( const OffscreenWindow& );
-  OffscreenWindow& operator=( OffscreenWindow& );
-
-  /**
-   * This is for initialization of this OffscreenWindow in case it is created before adaptor is running.
-   */
-  void OnPreInitOffscreenApplication();
-
-  /*
-   * @brief Initialize the OffscreenWindow (for internal use)
-   */
-  void Initialize();
-};
-
-inline OffscreenWindow& GetImplementation( Dali::OffscreenWindow& offscreenWindow )
-{
-  DALI_ASSERT_ALWAYS( offscreenWindow && "Dali::OffscreenWindow handle is empty" );
-
-  BaseObject& handle = offscreenWindow.GetBaseObject();
-
-  return static_cast<OffscreenWindow&>( handle );
-}
-
-inline const OffscreenWindow& GetImplementation( const Dali::OffscreenWindow& offscreenWindow )
-{
-  DALI_ASSERT_ALWAYS( offscreenWindow && "Dali::OffscreenWindow handle is empty" );
-
-  const BaseObject& handle = offscreenWindow.GetBaseObject();
-
-  return static_cast<const OffscreenWindow&>( handle );
-}
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_H
diff --git a/dali/internal/offscreen/file.list b/dali/internal/offscreen/file.list
deleted file mode 100644 (file)
index 3b6109f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# module: offscreen, backend: common
-SET( adaptor_offscreen_common_src_files
-    ${adaptor_offscreen_dir}/common/offscreen-application-impl.cpp
-)
-
-
-# module: offscreen, backend: tizen
-SET( adaptor_offscreen_tizen_src_files
-    ${adaptor_offscreen_dir}/tizen/offscreen-window-impl-tizen.cpp
-    ${adaptor_offscreen_dir}/tizen/offscreen-window-factory-tizen.cpp
-)
-
-# module: offscreen, backend: ubuntu-x11
-SET( adaptor_offscreen_ubuntu-x11_src_files
-    ${adaptor_offscreen_dir}/ubuntu-x11/offscreen-window-impl-x.cpp
-    ${adaptor_offscreen_dir}/ubuntu-x11/offscreen-window-factory-x.cpp
-)
-
-# module: offscreen, backend: android
-SET( adaptor_offscreen_android_src_files
-    ${adaptor_offscreen_dir}/android/offscreen-window-impl-android.cpp
-    ${adaptor_offscreen_dir}/android/offscreen-window-factory-android.cpp
-)
-
-# module: offscreen, backend: windows
-SET( adaptor_offscreen_windows_src_files
-    ${adaptor_offscreen_dir}/windows/offscreen-window-impl-win.cpp
-    ${adaptor_offscreen_dir}/windows/offscreen-window-factory-win.cpp
-)
diff --git a/dali/internal/offscreen/tizen/offscreen-window-factory-tizen.cpp b/dali/internal/offscreen/tizen/offscreen-window-factory-tizen.cpp
deleted file mode 100644 (file)
index dfcb7e6..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/offscreen/tizen/offscreen-window-factory-tizen.h>
-
-// INTERNAL HEADERS
-#include <dali/internal/offscreen/tizen/offscreen-window-impl-tizen.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-std::unique_ptr< OffscreenWindow > OffscreenWindowFactoryTizen::CreateOffscreenWindow( uint16_t width, uint16_t height, Any surface, bool isTranslucent )
-{
-  return std::unique_ptr< OffscreenWindow >( OffscreenWindowTizen::New( width, height, surface, isTranslucent ) );
-}
-
-std::unique_ptr< OffscreenWindowFactory > GetOffscreenWindowFactory()
-{
-  return std::unique_ptr< OffscreenWindowFactoryTizen >( new OffscreenWindowFactoryTizen() );
-}
-
-} // Internal
-} // Dali
diff --git a/dali/internal/offscreen/tizen/offscreen-window-factory-tizen.h b/dali/internal/offscreen/tizen/offscreen-window-factory-tizen.h
deleted file mode 100644 (file)
index b4c0a0d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_TIZEN_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_TIZEN_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-factory.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-class OffscreenWindowFactoryTizen : public OffscreenWindowFactory
-{
-public:
-
-  /**
-   * @brief Create a new OffscreenWindow
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  std::unique_ptr< OffscreenWindow > CreateOffscreenWindow( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent ) override;
-};
-
-} // Internal
-} // Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_TIZEN_H
diff --git a/dali/internal/offscreen/tizen/offscreen-window-impl-tizen.cpp b/dali/internal/offscreen/tizen/offscreen-window-impl-tizen.cpp
deleted file mode 100644 (file)
index b432d72..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/clipboard.h>
-#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-#include <dali/integration-api/adaptor-framework/native-render-surface.h>
-#include <dali/integration-api/adaptor-framework/native-render-surface-factory.h>
-#include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/actors/layer.h>
-#include <tbm_surface.h>
-#include <tbm_surface_queue.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-application-impl.h>
-
-// CLASS HEADER
-#include <dali/internal/offscreen/tizen/offscreen-window-impl-tizen.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-OffscreenWindowTizen* OffscreenWindowTizen::New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-{
-  OffscreenWindowTizen* window = new OffscreenWindowTizen( width, height, surface, isTranslucent );
-  return window;
-}
-
-OffscreenWindowTizen::OffscreenWindowTizen( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-: mRenderNotification(),
-  mIsTranslucent( isTranslucent )
-{
-  // Create surface
-  if ( surface.Empty() )
-  {
-    mSurface = std::unique_ptr< RenderSurfaceInterface >( CreateNativeSurface( SurfaceSize( width, height ), surface, isTranslucent ) );
-  }
-  else
-  {
-    width = static_cast<uint16_t>( tbm_surface_queue_get_width( AnyCast< tbm_surface_queue_h > ( surface ) ) );
-    height = static_cast<uint16_t>( tbm_surface_queue_get_height( AnyCast< tbm_surface_queue_h > ( surface ) ) );
-    mSurface = std::unique_ptr< RenderSurfaceInterface >( CreateNativeSurface( SurfaceSize( width, height ), surface, isTranslucent ) );
-  }
-}
-
-void OffscreenWindowTizen::Initialize( bool isDefaultWindow )
-{
-  if( isDefaultWindow )
-  {
-    Initialize();
-    return;
-  }
-
-  Dali::Integration::SceneHolder sceneHolderHandler = Dali::Integration::SceneHolder( this );
-  Dali::Adaptor::Get().AddWindow( sceneHolderHandler, "", "", mIsTranslucent );
-
-  Initialize();
-}
-
-void OffscreenWindowTizen::Initialize()
-{
-  // Connect callback to be notified when the surface is rendered
-  TriggerEventFactory triggerEventFactory;
-
-  mRenderNotification = std::unique_ptr< TriggerEventInterface >( triggerEventFactory.CreateTriggerEvent( MakeCallback( this, &OffscreenWindowTizen::OnPostRender ), TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER ) );
-
-  NativeRenderSurface* surface = GetNativeRenderSurface();
-
-  if( !surface )
-  {
-    return;
-  }
-
-  surface->SetRenderNotification( mRenderNotification.get() );
-}
-
-OffscreenWindowTizen::~OffscreenWindowTizen()
-{
-  NativeRenderSurface* surface = GetNativeRenderSurface();
-
-  if( surface )
-  {
-    // To prevent notification triggering in NativeRenderSurface::PostRender while deleting SceneHolder
-    surface->SetRenderNotification( nullptr );
-  }
-}
-
-uint32_t OffscreenWindowTizen::GetLayerCount() const
-{
-  return mScene.GetLayerCount();
-}
-
-Dali::Layer OffscreenWindowTizen::GetLayer( uint32_t depth ) const
-{
-  return mScene.GetLayer( depth );
-}
-
-OffscreenWindow::WindowSize OffscreenWindowTizen::GetSize() const
-{
-  Size size = mScene.GetSize();
-
-  return OffscreenWindow::WindowSize( static_cast<uint16_t>( size.width ), static_cast<uint16_t>( size.height ) );
-}
-
-Dali::Any OffscreenWindowTizen::GetNativeHandle() const
-{
-  return GetNativeRenderSurface()->GetNativeHandle();
-}
-
-NativeRenderSurface* OffscreenWindowTizen::GetNativeRenderSurface() const
-{
-  return dynamic_cast< NativeRenderSurface* >( mSurface.get() );
-}
-
-void OffscreenWindowTizen::OnPostRender()
-{
-  mPostRenderSignal.Emit( Dali::OffscreenWindow( this ), nullptr );
-}
-
-OffscreenWindow::PostRenderSignalType& OffscreenWindowTizen::PostRenderSignal()
-{
-  return mPostRenderSignal;
-}
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/offscreen/tizen/offscreen-window-impl-tizen.h b/dali/internal/offscreen/tizen/offscreen-window-impl-tizen.h
deleted file mode 100644 (file)
index 076b09d..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_TIZEN_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_TIZEN_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-impl.h>
-
-namespace Dali
-{
-class Adaptor;
-class Layer;
-class NativeRenderSurface;
-class TriggerEventInterface;
-
-namespace Internal
-{
-
-class OffscreenWindowTizen : public Dali::Internal::OffscreenWindow
-{
-public:
-
-  static OffscreenWindowTizen* New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-public:
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayerCount
-   */
-  uint32_t GetLayerCount() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayer
-   */
-  Dali::Layer GetLayer( uint32_t depth ) const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetSize
-   */
-  WindowSize GetSize() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetNativeHandle
-   */
-  Dali::Any GetNativeHandle() const override;
-
-  /*
-   * @brief Initialize the OffscreenWindow
-   * @param[in] isDefaultWindow Whether the OffscreenWindow is a default one or not
-   */
-  void Initialize( bool isDefaultWindow );
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::OffscreenWindow::PostRenderSignal
-   */
-  OffscreenWindow::PostRenderSignalType& PostRenderSignal();
-
-private:
-  /**
-   * This function is called after drawing by dali.
-   */
-  void OnPostRender();
-
-  /**
-   * @brief Get the native render surface
-   * @return The render surface
-   */
-  NativeRenderSurface* GetNativeRenderSurface() const;
-
-private:
-
-  /**
-   * Private constructor
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  OffscreenWindowTizen( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-  /**
-   * Destructor
-   */
-  virtual ~OffscreenWindowTizen();
-
-  // Undefined
-  OffscreenWindowTizen( const OffscreenWindowTizen& );
-  OffscreenWindowTizen& operator=( OffscreenWindowTizen& );
-
-  /*
-   * @brief Initialize the OffscreenWindow (for internal use)
-   */
-  void Initialize();
-
-private:
-
-  std::unique_ptr< TriggerEventInterface >  mRenderNotification;
-  PostRenderSignalType                      mPostRenderSignal;
-  bool                                      mIsTranslucent;
-};
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_TIZEN_H
diff --git a/dali/internal/offscreen/ubuntu-x11/offscreen-window-factory-x.cpp b/dali/internal/offscreen/ubuntu-x11/offscreen-window-factory-x.cpp
deleted file mode 100644 (file)
index 8df3001..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/offscreen/ubuntu-x11/offscreen-window-factory-x.h>
-
-// INTERNAL HEADERS
-#include <dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-std::unique_ptr< OffscreenWindow > OffscreenWindowFactoryX::CreateOffscreenWindow( uint16_t width, uint16_t height, Any surface, bool isTranslucent )
-{
-  return std::unique_ptr< OffscreenWindow >( OffscreenWindowX::New( width, height, surface, isTranslucent ) );
-}
-
-std::unique_ptr< OffscreenWindowFactory > GetOffscreenWindowFactory()
-{
-  return std::unique_ptr< OffscreenWindowFactoryX >( new OffscreenWindowFactoryX() );
-}
-
-} // Internal
-} // Dali
diff --git a/dali/internal/offscreen/ubuntu-x11/offscreen-window-factory-x.h b/dali/internal/offscreen/ubuntu-x11/offscreen-window-factory-x.h
deleted file mode 100644 (file)
index d3da19e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_X_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_X_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-factory.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-class OffscreenWindowFactoryX : public OffscreenWindowFactory
-{
-public:
-
-  /**
-   * @brief Create a new OffscreenWindow
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  std::unique_ptr< OffscreenWindow > CreateOffscreenWindow( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent ) override;
-};
-
-} // Internal
-} // Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_X_H
diff --git a/dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.cpp b/dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.cpp
deleted file mode 100644 (file)
index 656bd77..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/layer.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-application-impl.h>
-
-// CLASS HEADER
-#include <dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-OffscreenWindowX* OffscreenWindowX::New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-{
-  OffscreenWindowX* window = new OffscreenWindowX( width, height, surface, isTranslucent );
-  return window;
-}
-
-OffscreenWindowX::OffscreenWindowX( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-: mIsTranslucent( isTranslucent )
-{
-}
-
-void OffscreenWindowX::Initialize( bool isDefaultWindow )
-{
-}
-
-void OffscreenWindowX::Initialize()
-{
-}
-
-OffscreenWindowX::~OffscreenWindowX()
-{
-}
-
-uint32_t OffscreenWindowX::GetLayerCount() const
-{
-  return 0;
-}
-
-Dali::Layer OffscreenWindowX::GetLayer( uint32_t depth ) const
-{
-  return Dali::Layer();
-}
-
-OffscreenWindow::WindowSize OffscreenWindowX::GetSize() const
-{
-  return OffscreenWindow::WindowSize();
-}
-
-Dali::Any OffscreenWindowX::GetNativeHandle() const
-{
-  return Any();
-}
-
-NativeRenderSurface* OffscreenWindowX::GetNativeRenderSurface() const
-{
-  return nullptr;
-}
-
-void OffscreenWindowX::OnPostRender()
-{
-}
-
-OffscreenWindow::PostRenderSignalType& OffscreenWindowX::PostRenderSignal()
-{
-  return mPostRenderSignal;
-}
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.h b/dali/internal/offscreen/ubuntu-x11/offscreen-window-impl-x.h
deleted file mode 100644 (file)
index aceca0b..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_X_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_X_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-impl.h>
-
-namespace Dali
-{
-class Adaptor;
-class Layer;
-class NativeRenderSurface;
-class TriggerEventInterface;
-
-namespace Internal
-{
-
-class OffscreenWindowX : public Dali::Internal::OffscreenWindow
-{
-public:
-
-  static OffscreenWindowX* New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-public:
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayerCount
-   */
-  uint32_t GetLayerCount() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayer
-   */
-  Dali::Layer GetLayer( uint32_t depth ) const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetSize
-   */
-  WindowSize GetSize() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetNativeHandle
-   */
-  Dali::Any GetNativeHandle() const override;
-
-  /*
-   * @brief Initialize the OffscreenWindow
-   * @param[in] isDefaultWindow Whether the OffscreenWindow is a default one or not
-   */
-  void Initialize( bool isDefaultWindow );
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::OffscreenWindow::PostRenderSignal
-   */
-  OffscreenWindow::PostRenderSignalType& PostRenderSignal();
-
-private:
-  /**
-   * This function is called after drawing by dali.
-   */
-  void OnPostRender();
-
-  /**
-   * @brief Get the native render surface
-   * @return The render surface
-   */
-  NativeRenderSurface* GetNativeRenderSurface() const;
-
-private:
-
-  /**
-   * Private constructor
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  OffscreenWindowX( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-  /**
-   * Destructor
-   */
-  virtual ~OffscreenWindowX();
-
-  // Undefined
-  OffscreenWindowX( const OffscreenWindowX& );
-  OffscreenWindowX& operator=( OffscreenWindowX& );
-
-  /*
-   * @brief Initialize the OffscreenWindow (for internal use)
-   */
-  void Initialize();
-
-private:
-
-  PostRenderSignalType                      mPostRenderSignal;
-  bool                                      mIsTranslucent;
-};
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_X_H
diff --git a/dali/internal/offscreen/windows/offscreen-window-factory-win.cpp b/dali/internal/offscreen/windows/offscreen-window-factory-win.cpp
deleted file mode 100644 (file)
index cdfeb41..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/offscreen/windows/offscreen-window-factory-win.h>
-
-// INTERNAL HEADERS
-#include <dali/internal/offscreen/windows/offscreen-window-impl-win.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-std::unique_ptr< OffscreenWindow > OffscreenWindowFactoryWin::CreateOffscreenWindow( uint16_t width, uint16_t height, Any surface, bool isTranslucent )
-{
-  return std::unique_ptr< OffscreenWindow >( OffscreenWindowWin::New( width, height, surface, isTranslucent ) );
-}
-
-std::unique_ptr< OffscreenWindowFactory > GetOffscreenWindowFactory()
-{
-  return std::unique_ptr< OffscreenWindowFactoryWin >( new OffscreenWindowFactoryWin() );
-}
-
-} // Internal
-} // Dali
diff --git a/dali/internal/offscreen/windows/offscreen-window-factory-win.h b/dali/internal/offscreen/windows/offscreen-window-factory-win.h
deleted file mode 100644 (file)
index bd641ba..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_WIN_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_WIN_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-factory.h>
-
-namespace Dali
-{
-namespace Internal
-{
-
-class OffscreenWindowFactoryAndroid : public OffscreenWindowFactory
-{
-public:
-
-  /**
-   * @brief Create a new OffscreenWindow
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  std::unique_ptr< OffscreenWindow > CreateOffscreenWindow( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent ) override;
-};
-
-} // Internal
-} // Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_FACTORY_WIN_H
diff --git a/dali/internal/offscreen/windows/offscreen-window-impl-win.cpp b/dali/internal/offscreen/windows/offscreen-window-impl-win.cpp
deleted file mode 100644 (file)
index f97704e..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/layer.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-application-impl.h>
-
-// CLASS HEADER
-#include <dali/internal/offscreen/windows/offscreen-window-impl-win.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-OffscreenWindowWin* OffscreenWindowWin::New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-{
-  OffscreenWindowWin* window = new OffscreenWindowWin( width, height, surface, isTranslucent );
-  return window;
-}
-
-OffscreenWindowWin::OffscreenWindowWin( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-: mIsTranslucent( isTranslucent )
-{
-}
-
-void OffscreenWindowWin::Initialize( bool isDefaultWindow )
-{
-}
-
-void OffscreenWindowWin::Initialize()
-{
-}
-
-OffscreenWindowWin::~OffscreenWindowWin()
-{
-}
-
-uint32_t OffscreenWindowWin::GetLayerCount() const
-{
-  return 0;
-}
-
-Dali::Layer OffscreenWindowWin::GetLayer( uint32_t depth ) const
-{
-  return Dali::Layer();
-}
-
-OffscreenWindow::WindowSize OffscreenWindowWin::GetSize() const
-{
-  return OffscreenWindow::WindowSize();
-}
-
-Dali::Any OffscreenWindowWin::GetNativeHandle() const
-{
-  return Any();
-}
-
-NativeRenderSurface* OffscreenWindowWin::GetNativeRenderSurface() const
-{
-  return nullptr;
-}
-
-void OffscreenWindowWin::OnPostRender()
-{
-}
-
-OffscreenWindow::PostRenderSignalType& OffscreenWindowWin::PostRenderSignal()
-{
-  return mPostRenderSignal;
-}
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/offscreen/windows/offscreen-window-impl-win.h b/dali/internal/offscreen/windows/offscreen-window-impl-win.h
deleted file mode 100644 (file)
index d115948..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_WIN_H
-#define DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_WIN_H
-
-/*
- * Copyright (c) 2020 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/offscreen/common/offscreen-window-impl.h>
-
-namespace Dali
-{
-class Adaptor;
-class Layer;
-class NativeRenderSurface;
-class TriggerEventInterface;
-
-namespace Internal
-{
-
-class OffscreenWindowWin : public Dali::Internal::OffscreenWindow
-{
-public:
-
-  static OffscreenWindowWin* New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-public:
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayerCount
-   */
-  uint32_t GetLayerCount() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetLayer
-   */
-  Dali::Layer GetLayer( uint32_t depth ) const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetSize
-   */
-  WindowSize GetSize() const;
-
-  /**
-   * @copydoc Dali::OffscreenWindow::GetNativeHandle
-   */
-  Dali::Any GetNativeHandle() const override;
-
-  /*
-   * @brief Initialize the OffscreenWindow
-   * @param[in] isDefaultWindow Whether the OffscreenWindow is a default one or not
-   */
-  void Initialize( bool isDefaultWindow );
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::OffscreenWindow::PostRenderSignal
-   */
-  OffscreenWindow::PostRenderSignalType& PostRenderSignal();
-
-private:
-  /**
-   * This function is called after drawing by dali.
-   */
-  void OnPostRender();
-
-  /**
-   * @brief Get the native render surface
-   * @return The render surface
-   */
-  NativeRenderSurface* GetNativeRenderSurface() const;
-
-private:
-
-  /**
-   * Private constructor
-   *
-   * @param[in] width The initial width of the OffscreenWindow
-   * @param[in] height The initial height of the OffscreenWindow
-   * @param[in] surface The tbm surface queue handle
-   * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
-   */
-  OffscreenWindowWin( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
-  /**
-   * Destructor
-   */
-  virtual ~OffscreenWindowWin();
-
-  // Undefined
-  OffscreenWindowWin( const OffscreenWindowWin& );
-  OffscreenWindowWin& operator=( OffscreenWindowWin& );
-
-  /*
-   * @brief Initialize the OffscreenWindow (for internal use)
-   */
-  void Initialize();
-
-private:
-
-  PostRenderSignalType                      mPostRenderSignal;
-  bool                                      mIsTranslucent;
-};
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_OFFSCREEN_WINDOW_IMPL_WIN_H
index 15a603eea4d3de0d9dfa8406259a463f62e9ad7c..ed5d8fb0de409d2871dad9d810f400fb35a7cd74 100644 (file)
@@ -231,8 +231,6 @@ void NativeRenderSurfaceEcoreWl::StartRender()
 
 bool NativeRenderSurfaceEcoreWl::PreRender( bool resizingSurface, const std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect )
 {
-  MakeContextCurrent();
-
   auto eglGraphics = static_cast<Internal::Adaptor::EglGraphics*>(mGraphics);
   if (eglGraphics)
   {
@@ -257,62 +255,45 @@ void NativeRenderSurfaceEcoreWl::PostRender( bool renderToFbo, bool replacingSur
     eglImpl.SwapBuffers( mEGLSurface, damagedRects );
   }
 
-  if ( mOwnSurface )
+  if( mThreadSynchronization )
   {
-    if( mThreadSynchronization )
-    {
-      mThreadSynchronization->PostRenderStarted();
-    }
-
-    if( tbm_surface_queue_can_acquire( mTbmQueue, 1 ) )
-    {
-      if( tbm_surface_queue_acquire( mTbmQueue, &mConsumeSurface ) != TBM_SURFACE_QUEUE_ERROR_NONE )
-      {
-        DALI_LOG_ERROR( "Failed to acquire a tbm_surface\n" );
-        return;
-      }
-    }
-
-    if ( mConsumeSurface )
-    {
-      tbm_surface_internal_ref( mConsumeSurface );
-    }
+    mThreadSynchronization->PostRenderStarted();
+  }
 
-    if( replacingSurface )
+  if( tbm_surface_queue_can_acquire( mTbmQueue, 1 ) )
+  {
+    if( tbm_surface_queue_acquire( mTbmQueue, &mConsumeSurface ) != TBM_SURFACE_QUEUE_ERROR_NONE )
     {
-      ConditionalWait::ScopedLock lock( mTbmSurfaceCondition );
-      mDrawableCompleted = true;
-      mTbmSurfaceCondition.Notify( lock );
+      DALI_LOG_ERROR( "Failed to acquire a tbm_surface\n" );
+      return;
     }
+  }
 
-   // create damage for client applications which wish to know the update timing
-    if( !replacingSurface && mRenderNotification )
-    {
-      // use notification trigger
-      // Tell the event-thread to render the tbm_surface
-      mRenderNotification->Trigger();
-    }
+  tbm_surface_internal_ref( mConsumeSurface );
 
-    if( mThreadSynchronization )
-    {
-      // wait until the event-thread completed to use the tbm_surface
-      mThreadSynchronization->PostRenderWaitForCompletion();
-    }
+  if( replacingSurface )
+  {
+    ConditionalWait::ScopedLock lock( mTbmSurfaceCondition );
+    mDrawableCompleted = true;
+    mTbmSurfaceCondition.Notify( lock );
+  }
 
-    // release the consumed surface after post render was completed
-    ReleaseDrawable();
+ // create damage for client applications which wish to know the update timing
+  if( !replacingSurface && mRenderNotification )
+  {
+    // use notification trigger
+    // Tell the event-thread to render the tbm_surface
+    mRenderNotification->Trigger();
   }
-  else
+
+  if( mThreadSynchronization )
   {
-    // create damage for client applications which wish to know the update timing
-    if( !replacingSurface && mRenderNotification )
-    {
-      // use notification trigger
-      // Tell the event-thread to render the tbm_surface
-      mRenderNotification->Trigger();
-    }
+    // wait until the event-thread completed to use the tbm_surface
+    mThreadSynchronization->PostRenderWaitForCompletion();
   }
 
+  // release the consumed surface after post render was completed
+  ReleaseDrawable();
 }
 
 void NativeRenderSurfaceEcoreWl::StopRender()
@@ -348,11 +329,6 @@ Integration::StencilBufferAvailable NativeRenderSurfaceEcoreWl::GetStencilBuffer
   return mGraphics ? mGraphics->GetStencilBufferRequired() : Integration::StencilBufferAvailable::FALSE;
 }
 
-Any NativeRenderSurfaceEcoreWl::GetNativeHandle()
-{
-  return mTbmQueue;
-}
-
 void NativeRenderSurfaceEcoreWl::ReleaseLock()
 {
   if( mThreadSynchronization )
index 2e0b091daa1a404845cafad55af6c75370af02ac..3f2020bf7c7cbd8daf6a8f307f7a55de930658bc 100644 (file)
@@ -160,8 +160,6 @@ public: // from Dali::RenderSurfaceInterface
    */
   virtual Integration::StencilBufferAvailable GetStencilBufferRequired() override;
 
-  virtual Any GetNativeHandle() override;
-
 private:
 
   /**