X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fcommon%2Fwindow-render-surface.h;h=f8160b8cbeb8063f0480f9f3c3b88164813a8d70;hb=8786ea8fbb26a9cb555a613518cf108017467c69;hp=5353b7288563cceb555bcb5a4e176b0d16fcffd3;hpb=3601a229c1f7597ae20d350aaea33eb63dadb6d6;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/window-system/common/window-render-surface.h b/dali/internal/window-system/common/window-render-surface.h
old mode 100755
new mode 100644
index 5353b72..f8160b8
--- a/dali/internal/window-system/common/window-render-surface.h
+++ b/dali/internal/window-system/common/window-render-surface.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WINDOWSYSTEM_COMMON_WINDOW_RENDER_SURFACE_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * 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.
@@ -112,10 +112,10 @@ public: // API
    */
   OutputSignalType& OutputTransformedSignal();
 
-public: // from Dali::Integration::RenderSurface
+public: // from Dali::RenderSurfaceInterface
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::GetPositionSize()
+   * @copydoc Dali::RenderSurfaceInterface::GetPositionSize()
    */
   virtual PositionSize GetPositionSize() const override;
 
@@ -124,96 +124,80 @@ public: // from Dali::Integration::RenderSurface
   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;
-
-  /**
-   * @copydoc Dali::Integration::RenderSurface::InitializeGraphics()
+   * @copydoc Dali::RenderSurfaceInterface::InitializeGraphics()
    */
   virtual void InitializeGraphics() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::CreateSurface()
+   * @copydoc Dali::RenderSurfaceInterface::CreateSurface()
    */
   virtual void CreateSurface() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::DestroySurface()
+   * @copydoc Dali::RenderSurfaceInterface::DestroySurface()
    */
   virtual void DestroySurface() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::ReplaceGraphicsSurface()
+   * @copydoc Dali::RenderSurfaceInterface::ReplaceGraphicsSurface()
    */
   virtual bool ReplaceGraphicsSurface() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::MoveResize()
+   * @copydoc Dali::RenderSurfaceInterface::MoveResize()
    */
   virtual void MoveResize( Dali::PositionSize positionSize) override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::StartRender()
+   * @copydoc Dali::RenderSurfaceInterface::StartRender()
    */
   virtual void StartRender() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::PreRender()
+   * @copydoc Dali::RenderSurfaceInterface::PreRender()
    */
   virtual bool PreRender( bool resizingSurface ) override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::PostRender()
+   * @copydoc Dali::RenderSurfaceInterface::PostRender()
    */
   virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface );
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::StopRender()
+   * @copydoc Dali::RenderSurfaceInterface::StopRender()
    */
   virtual void StopRender() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::SetThreadSynchronization
+   * @copydoc Dali::RenderSurfaceInterface::SetThreadSynchronization
    */
   virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::ReleaseLock()
+   * @copydoc Dali::RenderSurfaceInterface::ReleaseLock()
    */
   virtual void ReleaseLock() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::GetSurfaceType()
+   * @copydoc Dali::RenderSurfaceInterface::GetSurfaceType()
    */
-  virtual Integration::RenderSurface::Type GetSurfaceType() override;
+  virtual Dali::RenderSurfaceInterface::Type GetSurfaceType() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::MakeContextCurrent()
+   * @copydoc Dali::RenderSurfaceInterface::MakeContextCurrent()
    */
   virtual void MakeContextCurrent() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::GetDepthBufferRequired()
+   * @copydoc Dali::RenderSurfaceInterface::GetDepthBufferRequired()
    */
   virtual Integration::DepthBufferAvailable GetDepthBufferRequired() override;
 
   /**
-   * @copydoc Dali::Integration::RenderSurface::GetStencilBufferRequired()
+   * @copydoc Dali::RenderSurfaceInterface::GetStencilBufferRequired()
    */
   virtual Integration::StencilBufferAvailable GetStencilBufferRequired() override;
 
-  /**
-   * @copydoc Dali::Integration::RenderSurface::SetDamagedRect()
-   */
-  virtual void SetDamagedRect( const Dali::DamagedRect& damagedRect, Dali::DamagedRect& mergedRect ) override;
-
-  /**
-   * @copydoc Dali::Integration::RenderSurface::GetBufferAge()
-   */
-  virtual int32_t GetBufferAge() override;
-
 private:
 
   /**
@@ -231,11 +215,6 @@ private:
    */
   void ProcessRotationRequest();
 
-  /*
-   *  @brief MergeRect
-   */
-  std::vector<int32_t> MergeRect( const Rect<int32_t>& damagedRectArray, int bufferAge );
-
 protected:
 
   // Undefined
@@ -260,8 +239,6 @@ private: // Data
   OutputSignalType                mOutputTransformedSignal;
   int                             mRotationAngle;
   int                             mScreenRotationAngle;
-  int                             mBufferAge;
-  int                             mPreBufferAge;
   bool                            mOwnSurface;         ///< Whether we own the surface (responsible for deleting it)
   bool                            mRotationSupported;
   bool                            mRotationFinished;
@@ -271,7 +248,6 @@ private: // Data
   uint32_t                        mDpiHorizontal;
   uint32_t                        mDpiVertical;
 
-  Rect<int32_t>                   mPreDamagedRect[5];  ///< The GPU driver can has up to four buffers. And one is for area calculation.
 }; // class WindowRenderSurface
 
 } // namespace Adaptor