projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add screen and client rotation itself function"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
tizen-wayland
/
native-render-surface-ecore-wl.h
diff --git
a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
index
dba6bfd
..
d21ed86
100644
(file)
--- a/
dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
+++ b/
dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
@@
-44,10
+44,11
@@
public:
/**
* Uses an Wayland surface to render to.
/**
* Uses an Wayland surface to render to.
- * @param [in] positionSize the position and size of the surface
+ * @param [in] surfaceSize the size of the surface
+ * @param [in] surface the native surface handle
* @param [in] isTransparent if it is true, surface has 32 bit color depth, otherwise, 24 bit
*/
* @param [in] isTransparent if it is true, surface has 32 bit color depth, otherwise, 24 bit
*/
- NativeRenderSurfaceEcoreWl(
Dali::PositionSize positionSiz
e, bool isTransparent = false );
+ NativeRenderSurfaceEcoreWl(
SurfaceSize surfaceSize, Any surfac
e, bool isTransparent = false );
/**
* @brief Destructor
/**
* @brief Destructor
@@
-59,126
+60,125
@@
public: // from WindowRenderSurface
/**
* @copydoc Dali::NativeRenderSurface::GetSurface()
*/
/**
* @copydoc Dali::NativeRenderSurface::GetSurface()
*/
-
virtual
Any GetDrawable() override;
+ Any GetDrawable() override;
/**
* @copydoc Dali::NativeRenderSurface::SetRenderNotification()
*/
/**
* @copydoc Dali::NativeRenderSurface::SetRenderNotification()
*/
- v
irtual v
oid SetRenderNotification( TriggerEventInterface* renderNotification ) override;
+ void SetRenderNotification( TriggerEventInterface* renderNotification ) override;
/**
* @copydoc Dali::NativeRenderSurface::WaitUntilSurfaceReplaced()
*/
/**
* @copydoc Dali::NativeRenderSurface::WaitUntilSurfaceReplaced()
*/
- virtual void WaitUntilSurfaceReplaced() override;
+ void WaitUntilSurfaceReplaced() override;
+
+ /**
+ * @copydoc Dali::NativeRenderSurface::GetNativeRenderable()
+ */
+ virtual Any GetNativeRenderable() override;
public: // from Dali::RenderSurfaceInterface
/**
* @copydoc Dali::RenderSurfaceInterface::GetPositionSize()
*/
public: // from Dali::RenderSurfaceInterface
/**
* @copydoc Dali::RenderSurfaceInterface::GetPositionSize()
*/
-
virtual
PositionSize GetPositionSize() const override;
+ PositionSize GetPositionSize() const override;
/**
* @copydoc Dali::RenderSurfaceInterface::GetDpi()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::GetDpi()
*/
- virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
-
- /**
- * @brief Return the orientation of the surface.
- * @return The orientation
- */
- virtual int GetOrientation() const override;
+ void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
* @copydoc Dali::RenderSurfaceInterface::InitializeGraphics()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::InitializeGraphics()
*/
- v
irtual v
oid InitializeGraphics() override;
+ void InitializeGraphics() override;
/**
* @copydoc Dali::RenderSurfaceInterface::CreateSurface()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::CreateSurface()
*/
- v
irtual v
oid CreateSurface() override;
+ void CreateSurface() override;
/**
* @copydoc Dali::RenderSurfaceInterface::DestroySurface()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::DestroySurface()
*/
- v
irtual v
oid DestroySurface() override;
+ void DestroySurface() override;
/**
* @copydoc Dali::RenderSurfaceInterface::ReplaceGraphicsSurface()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::ReplaceGraphicsSurface()
*/
-
virtual
bool ReplaceGraphicsSurface() override;
+ bool ReplaceGraphicsSurface() override;
/**
* @copydoc Dali::RenderSurfaceInterface::MoveResize()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::MoveResize()
*/
- v
irtual v
oid MoveResize( Dali::PositionSize positionSize) override;
+ void MoveResize( Dali::PositionSize positionSize) override;
/**
* @copydoc Dali::RenderSurfaceInterface::StartRender()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::StartRender()
*/
- v
irtual v
oid StartRender() override;
+ void StartRender() override;
/**
* @copydoc Dali::RenderSurfaceInterface::PreRender()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::PreRender()
*/
-
virtual bool PreRender( bool resizingSurface
) override;
+
bool PreRender( bool resizingSurface, const std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect
) override;
/**
* @copydoc Dali::RenderSurfaceInterface::PostRender()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::PostRender()
*/
- v
irtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface )
;
+ v
oid PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector<Rect<int>>& damagedRects ) override
;
/**
* @copydoc Dali::RenderSurfaceInterface::StopRender()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::StopRender()
*/
- v
irtual v
oid StopRender() override;
+ void StopRender() override;
/**
* @copydoc Dali::RenderSurfaceInterface::SetThreadSynchronization
*/
/**
* @copydoc Dali::RenderSurfaceInterface::SetThreadSynchronization
*/
- v
irtual v
oid SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization )override;
+ void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization )override;
/**
* @copydoc Dali::RenderSurfaceInterface::GetSurfaceType()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::GetSurfaceType()
*/
-
virtual
Dali::RenderSurfaceInterface::Type GetSurfaceType() override;
+ Dali::RenderSurfaceInterface::Type GetSurfaceType() override;
/**
* @copydoc Dali::RenderSurfaceInterface::MakeContextCurrent()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::MakeContextCurrent()
*/
- v
irtual v
oid MakeContextCurrent() override;
+ void MakeContextCurrent() override;
/**
* @copydoc Dali::RenderSurfaceInterface::GetDepthBufferRequired()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::GetDepthBufferRequired()
*/
-
virtual
Integration::DepthBufferAvailable GetDepthBufferRequired() override;
+ Integration::DepthBufferAvailable GetDepthBufferRequired() override;
/**
* @copydoc Dali::RenderSurfaceInterface::GetStencilBufferRequired()
*/
/**
* @copydoc Dali::RenderSurfaceInterface::GetStencilBufferRequired()
*/
-
virtual
Integration::StencilBufferAvailable GetStencilBufferRequired() override;
+ Integration::StencilBufferAvailable GetStencilBufferRequired() override;
private:
/**
* @copydoc Dali::RenderSurfaceInterface::ReleaseLock()
*/
private:
/**
* @copydoc Dali::RenderSurfaceInterface::ReleaseLock()
*/
- v
irtual v
oid ReleaseLock() override;
+ void ReleaseLock() override;
/**
* @copydoc Dali::NativeRenderSurface::CreateNativeRenderable()
*/
/**
* @copydoc Dali::NativeRenderSurface::CreateNativeRenderable()
*/
- v
irtual v
oid CreateNativeRenderable() override;
+ void CreateNativeRenderable() override;
/**
* @copydoc Dali::NativeRenderSurface::ReleaseDrawable()
*/
/**
* @copydoc Dali::NativeRenderSurface::ReleaseDrawable()
*/
- v
irtual v
oid ReleaseDrawable() override;
+ void ReleaseDrawable() override;
private: // Data
private: // Data
-
PositionSize mPosition
;
+
SurfaceSize mSurfaceSize
;
TriggerEventInterface* mRenderNotification;
Internal::Adaptor::GraphicsInterface* mGraphics; ///< The graphics interface
EglInterface* mEGL;
TriggerEventInterface* mRenderNotification;
Internal::Adaptor::GraphicsInterface* mGraphics; ///< The graphics interface
EglInterface* mEGL;