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 )
${adaptor_integration_api_android_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_sensor_android_src_files}
${adaptor_integration_api_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_sensor_tizen_src_files}
${adaptor_integration_api_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_sensor_tizen_src_files}
${adaptor_integration_api_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_sensor_tizen_src_files}
${adaptor_integration_api_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_sensor_tizen_src_files}
${adaptor_integration_api_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_sensor_ubuntu_src_files}
${adaptor_integration_api_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_sensor_tizen_src_files}
${adaptor_integration_api_src_files}
${adaptor_legacy_common_src_files}
${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
${adaptor_public_api_src_files}
${adaptor_sensor_common_src_files}
${adaptor_styling_common_src_files}
+++ /dev/null
-/*
- * 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, OffscreenApplication::RenderMode renderMode )
-{
- IntrusivePtr< Internal::OffscreenApplication > impl = Internal::OffscreenApplication::New( 0, 0, surface, false, 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
+++ /dev/null
-#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:
-
- /**
- * @brief Enumeration for the render mode
- */
- enum class RenderMode
- {
- AUTO, // Scene is rendered automatically
- MANUAL // Scene 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] renderMode The RenderMode of the OffscreenApplication
- */
- static OffscreenApplication New( Dali::Any surface, 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
+++ /dev/null
-/*
- * 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-window.h>
-
-// 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>
-
-namespace Dali
-{
-OffscreenWindow OffscreenWindow::New( uint16_t width, uint16_t height, bool isTranslucent )
-{
- Any surface;
- IntrusivePtr< Internal::OffscreenWindow > impl = Internal::OffscreenWindow::New( width, height, surface, isTranslucent );
- OffscreenWindow window = OffscreenWindow( impl.Get() );
- impl->Initialize( false );
-
- return window;
-}
-
-OffscreenWindow OffscreenWindow::New( Any surface )
-{
- IntrusivePtr< Internal::OffscreenWindow > impl = Internal::OffscreenWindow::New( 0, 0, surface, false );
- 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();
-}
-
-Uint16Pair OffscreenWindow::GetDpi() const
-{
- return Internal::GetImplementation(*this).GetDpi();
-}
-
-OffscreenWindow::PostRenderSignalType& OffscreenWindow::PostRenderSignal()
-{
- return Internal::GetImplementation( *this ).PostRenderSignal();
-}
-
-
-OffscreenWindow::OffscreenWindow( Internal::OffscreenWindow* window )
-: BaseHandle( window )
-{
-}
-
-} // namespace Dali
+++ /dev/null
-#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
- */
- static OffscreenWindow New( Any surface );
-
- /**
- * @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;
-
- /**
- * @brief Retrieves the DPI of the window.
- *
- * @return The DPI of the window
- */
- Uint16Pair GetDpi() 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
${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
)
${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
)
*/
virtual void WaitUntilSurfaceReplaced() = 0;
- /**
- * @brief Get the native renderable handle
- * @return The native renderable handle
- */
- virtual Any GetNativeRenderable() = 0;
-
private: // from NativeRenderSurface
/**
} // unnamed namespace
-Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, EnvironmentOptions* environmentOptions, ThreadMode threadMode )
+Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, 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();
Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, EnvironmentOptions* environmentOptions )
{
Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( window );
- Dali::Adaptor* adaptor = New( window, windowImpl.GetSurface(), environmentOptions, ThreadMode::NORMAL );
+ Dali::Adaptor* adaptor = New( window, windowImpl.GetSurface(), environmentOptions );
windowImpl.SetAdaptor( *adaptor );
return adaptor;
}
-Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, EnvironmentOptions* environmentOptions, ThreadMode threadMode )
+Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, 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 );
Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, EnvironmentOptions* environmentOptions )
{
Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( window );
- Dali::Adaptor* adaptor = New( graphicsFactory, window, windowImpl.GetSurface(), environmentOptions, ThreadMode::NORMAL );
+ Dali::Adaptor* adaptor = New( graphicsFactory, window, windowImpl.GetSurface(), environmentOptions );
windowImpl.SetAdaptor( *adaptor );
return adaptor;
} // Called first
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(),
mSystemTracer(),
mObjectProfiler( nullptr ),
mSocketFactory(),
- mThreadMode( threadMode ),
+ mThreadMode( ThreadMode::NORMAL ),
mEnvironmentOptionsOwned( environmentOptions ? false : true /* If not provided then we own the object */ ),
mUseRemoteSurface( false ),
mRootLayoutDirection( Dali::LayoutDirection::LEFT_TO_RIGHT )
* - 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 thread mode
*/
static Dali::Adaptor* New( Dali::Integration::SceneHolder window,
Dali::RenderSurfaceInterface* surface,
- EnvironmentOptions* environmentOptions,
- ThreadMode threadMode );
+ EnvironmentOptions* environmentOptions );
/**
* Creates a New Adaptor
* - 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 thread mode
*/
static Dali::Adaptor* New( GraphicsFactory& graphicsFactory,
Dali::Integration::SceneHolder window,
Dali::RenderSurfaceInterface* surface,
- EnvironmentOptions* environmentOptions,
- ThreadMode threadMode );
+ EnvironmentOptions* environmentOptions );
/**
* Creates a New Adaptor
* - 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
#include <dali/integration-api/adaptor-framework/scene-holder.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/window-system/common/window-impl.h>
-#include <dali/internal/adaptor/common/thread-controller-interface.h>
namespace Dali
{
{
Internal::Adaptor::SceneHolder* sceneHolder = &Dali::GetImplementation( window );
Dali::RenderSurfaceInterface* pSurface = const_cast<Dali::RenderSurfaceInterface *>(&surface);
- Adaptor* adaptor = Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( sceneHolder ), pSurface, NULL, Dali::Internal::Adaptor::ThreadMode::NORMAL );
+ Adaptor* adaptor = Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( sceneHolder ), pSurface, NULL );
return *adaptor;
}
Adaptor& Adaptor::New( Dali::Integration::SceneHolder window, const Dali::RenderSurfaceInterface& surface )
{
Dali::RenderSurfaceInterface* pSurface = const_cast<Dali::RenderSurfaceInterface *>(&surface);
- Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, pSurface, NULL, Dali::Internal::Adaptor::ThreadMode::NORMAL );
+ Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, pSurface, NULL );
return *adaptor;
}
+++ /dev/null
-/*
- * 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/common/offscreen-application-impl.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/offscreen/common/offscreen-window-impl.h>
-#include <dali/internal/adaptor/common/thread-controller-interface.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-#include <dali/integration-api/adaptor-framework/native-render-surface.h>
-
-using Dali::Internal::Adaptor::ThreadMode;
-using RenderMode = Dali::OffscreenApplication::RenderMode;
-
-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
- IntrusivePtr< Internal::OffscreenWindow > impl = Internal::OffscreenWindow::New( width, height, surface, isTranslucent );
- mDefaultWindow = Dali::OffscreenWindow( impl.Get() );
-
- mAdaptor.reset( Dali::Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( impl.Get() ), impl->GetSurface(), NULL,
- renderMode == RenderMode::AUTO ?
- Dali::Internal::Adaptor::ThreadMode::NORMAL : Dali::Internal::Adaptor::ThreadMode::RUN_IF_REQUESTED ) );
-
- // Initialize default window
- impl->Initialize( true );
-}
-
-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
+++ /dev/null
-#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/public-api/common/intrusive-ptr.h>
-#include <dali/public-api/object/base-object.h>
-
-// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/offscreen-application.h>
-#include <dali/devel-api/adaptor-framework/offscreen-window.h>
-#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
-
-namespace Dali
-{
-class Adaptor;
-
-namespace Internal
-{
-
-/**
- * Implementation of the OffscreenApplication class.
- */
-class OffscreenApplication : public BaseObject
-{
-public:
-
- using OffscreenApplicationSignalType = Dali::OffscreenApplication::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
- * @param[in] renderMode The RenderMode of the OffscreenApplication
- */
- static IntrusivePtr<OffscreenApplication> New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, Dali::OffscreenApplication::RenderMode renderMode);
-
-public:
-
- /**
- * Destructor
- */
- virtual ~OffscreenApplication() = default;
-
- /**
- * @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
- * @param[in] renderMode The RenderMode of the OffscreenApplication
- */
- OffscreenApplication( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent, Dali::OffscreenApplication::RenderMode renderMode );
-
- // Undefined
- OffscreenApplication( const OffscreenApplication& );
- OffscreenApplication& operator=( OffscreenApplication& );
-
-private:
- std::unique_ptr< 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
+++ /dev/null
-/*
- * 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/common/offscreen-window-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/layer.h>
-
-// INTERNAL INCLUDES
-#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/internal/offscreen/common/offscreen-application-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-OffscreenWindow* OffscreenWindow::New( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-{
- OffscreenWindow* window = new OffscreenWindow( width, height, surface, isTranslucent );
- return window;
-}
-
-OffscreenWindow::OffscreenWindow( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent )
-: mRenderNotification()
-{
- // Create surface
- mSurface = std::unique_ptr< RenderSurfaceInterface >( CreateNativeSurface( SurfaceSize( width, height ), surface, isTranslucent ) );
-}
-
-void OffscreenWindow::Initialize( bool isDefaultWindow )
-{
- if( isDefaultWindow )
- {
- Initialize();
- return;
- }
-
- Dali::Integration::SceneHolder sceneHolderHandler = Dali::Integration::SceneHolder( this );
- Dali::Adaptor::Get().AddWindow( sceneHolderHandler );
-
- Initialize();
-}
-
-void OffscreenWindow::Initialize()
-{
- // Connect callback to be notified when the surface is rendered
- TriggerEventFactory triggerEventFactory;
-
- mRenderNotification = std::unique_ptr< TriggerEventInterface >( triggerEventFactory.CreateTriggerEvent( MakeCallback( this, &OffscreenWindow::OnPostRender ), TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER ) );
-
- NativeRenderSurface* surface = GetNativeRenderSurface();
-
- if( !surface )
- {
- return;
- }
-
- surface->SetRenderNotification( mRenderNotification.get() );
-}
-
-OffscreenWindow::~OffscreenWindow()
-{
- NativeRenderSurface* surface = GetNativeRenderSurface();
-
- if( surface )
- {
- // To prevent notification triggering in NativeRenderSurface::PostRender while deleting SceneHolder
- surface->SetRenderNotification( nullptr );
- }
-}
-
-uint32_t OffscreenWindow::GetLayerCount() const
-{
- return mScene.GetLayerCount();
-}
-
-Dali::Layer OffscreenWindow::GetLayer( uint32_t depth ) const
-{
- return mScene.GetLayer( depth );
-}
-
-OffscreenWindow::WindowSize OffscreenWindow::GetSize() const
-{
- Size size = mScene.GetSize();
-
- return OffscreenWindow::WindowSize( static_cast<uint16_t>( size.width ), static_cast<uint16_t>( size.height ) );
-}
-
-Dali::Any OffscreenWindow::GetNativeHandle() const
-{
- return GetNativeRenderSurface()->GetNativeRenderable();
-}
-
-NativeRenderSurface* OffscreenWindow::GetNativeRenderSurface() const
-{
- return dynamic_cast< NativeRenderSurface* >( mSurface.get() );
-}
-
-void OffscreenWindow::OnPostRender()
-{
- mPostRenderSignal.Emit( Dali::OffscreenWindow( this ), GetNativeHandle() );
-}
-
-OffscreenWindow::PostRenderSignalType& OffscreenWindow::PostRenderSignal()
-{
- return mPostRenderSignal;
-}
-
-} // namespace Internal
-
-} // namespace Dali
+++ /dev/null
-#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/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>
-#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
-
-namespace Dali
-{
-class Adaptor;
-class Layer;
-class NativeRenderSurface;
-class TriggerEventInterface;
-
-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();
-
- /**
- * @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
- */
- 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
- */
- 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 native surface handle
- * @param[in] isTranslucent Whether the OffscreenWindow is translucent or not
- */
- OffscreenWindow( uint16_t width, uint16_t height, Dali::Any surface, bool isTranslucent );
-
- // Undefined
- OffscreenWindow( const OffscreenWindow& );
- OffscreenWindow& operator=( OffscreenWindow& );
-
- /*
- * @brief Initialize the OffscreenWindow (for internal use)
- */
- void Initialize();
-
-private:
-
- std::unique_ptr< TriggerEventInterface > mRenderNotification;
- PostRenderSignalType mPostRenderSignal;
-};
-
-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
+++ /dev/null
-# module: offscreen, backend: common
-SET( adaptor_offscreen_common_src_files
- ${adaptor_offscreen_dir}/common/offscreen-application-impl.cpp
- ${adaptor_offscreen_dir}/common/offscreen-window-impl.cpp
-)
} // unnamed namespace
NativeRenderSurfaceEcoreWl::NativeRenderSurfaceEcoreWl( SurfaceSize surfaceSize, Any surface, bool isTransparent )
-: mRenderNotification( NULL ),
+: mSurfaceSize( surfaceSize ),
+ mRenderNotification( NULL ),
mGraphics( NULL ),
mEGL( nullptr ),
mEGLSurface( nullptr ),
mEGLContext( nullptr ),
+ mColorDepth( isTransparent ? COLOR_DEPTH_32 : COLOR_DEPTH_24 ),
+ mTbmFormat( isTransparent ? TBM_FORMAT_ARGB8888 : TBM_FORMAT_RGB888 ),
mOwnSurface( false ),
mDrawableCompleted( false ),
mTbmQueue( NULL ),
if( surface.Empty() )
{
- mSurfaceSize = surfaceSize;
- mColorDepth = isTransparent ? COLOR_DEPTH_32 : COLOR_DEPTH_24;
- mTbmFormat = isTransparent ? TBM_FORMAT_ARGB8888 : TBM_FORMAT_RGB888;
CreateNativeRenderable();
}
else
{
+ // check we have a valid type
+ DALI_ASSERT_ALWAYS( ( surface.GetType() == typeid (tbm_surface_queue_h) ) && "Surface type is invalid" );
mTbmQueue = AnyCast< tbm_surface_queue_h >( surface );
-
- uint16_t width = static_cast<uint16_t>( tbm_surface_queue_get_width( mTbmQueue ) );
- uint16_t height = static_cast<uint16_t>( tbm_surface_queue_get_height( mTbmQueue ) );
- mSurfaceSize = SurfaceSize( width, height );
-
- mTbmFormat = tbm_surface_queue_get_format( mTbmQueue );
-
- mColorDepth = ( mTbmFormat == TBM_FORMAT_ARGB8888 ) ? COLOR_DEPTH_32 : COLOR_DEPTH_24;
}
}
mDrawableCompleted = false;
}
-Any NativeRenderSurfaceEcoreWl::GetNativeRenderable()
-{
- return mTbmQueue;
-}
-
PositionSize NativeRenderSurfaceEcoreWl::GetPositionSize() const
{
return PositionSize( 0, 0, static_cast<int>( mSurfaceSize.GetWidth() ), static_cast<int>( mSurfaceSize.GetHeight() ) );
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)
{
}
}
- if ( mConsumeSurface )
- {
- tbm_surface_internal_ref( mConsumeSurface );
- }
+ tbm_surface_internal_ref( mConsumeSurface );
if( replacingSurface )
{
*/
virtual void WaitUntilSurfaceReplaced() override;
- /**
- * @copydoc Dali::NativeRenderSurface::GetNativeRenderable()
- */
- virtual Any GetNativeRenderable() override;
-
public: // from Dali::RenderSurfaceInterface
/**
projects / platform / core / uifw / dali-adaptor.git / commitdiff