X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Fintegration-api%2Fadaptor-framework%2Frender-surface-interface.h;h=45250b16a19113fda8f3ae74a3b06e7efd029ecc;hb=aa19ec5a3944989bb2eed21eb6c316775cafd38a;hp=25ad128ba7a9a78b008748b88424ee38b71badf0;hpb=8047c78f1a02d4db60d7af87080e2d5f248e45d5;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/integration-api/adaptor-framework/render-surface-interface.h b/dali/integration-api/adaptor-framework/render-surface-interface.h
index 25ad128..45250b1 100644
--- a/dali/integration-api/adaptor-framework/render-surface-interface.h
+++ b/dali/integration-api/adaptor-framework/render-surface-interface.h
@@ -20,13 +20,16 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/core-enumerations.h>
-#include <dali/public-api/math/vector4.h>
+#include <dali/integration-api/scene.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/math/rect.h>
+#include <dali/public-api/math/uint-16-pair.h>
+#include <dali/public-api/math/vector4.h>
 #include <dali/public-api/object/any.h>
+#include <dali/public-api/object/weak-handle.h>
 
 namespace Dali
 {
-
 class DisplayConnection;
 class ThreadSynchronizationInterface;
 
@@ -36,13 +39,14 @@ namespace Adaptor
 {
 class AdaptorInternalServices;
 class GraphicsInterface;
-}
-}
+} // namespace Adaptor
+} // namespace Internal
 
 /**
  * @brief The position and size of the render surface.
  */
-typedef Dali::Rect<int> PositionSize;
+using PositionSize = Dali::Rect<int>;
+using SurfaceSize  = Uint16Pair;
 
 /**
  * @brief Interface for a render surface onto which Dali draws.
@@ -60,7 +64,6 @@ typedef Dali::Rect<int> PositionSize;
 class RenderSurfaceInterface
 {
 public:
-
   enum Type
   {
     WINDOW_RENDER_SURFACE,
@@ -73,18 +76,23 @@ public:
    * Inlined as this is a pure abstract interface
    */
   RenderSurfaceInterface()
-  : mAdaptor( nullptr ),
-    mGraphics( nullptr ),
-    mDisplayConnection( nullptr ),
-    mDepthBufferRequired( Integration::DepthBufferAvailable::FALSE ),
-    mStencilBufferRequired( Integration::StencilBufferAvailable::FALSE )
-  {}
+  : mAdaptor(nullptr),
+    mGraphics(nullptr),
+    mDisplayConnection(nullptr),
+    mScene(),
+    mFullSwapNextFrame(true),
+    mDepthBufferRequired(Integration::DepthBufferAvailable::FALSE),
+    mStencilBufferRequired(Integration::StencilBufferAvailable::FALSE)
+  {
+  }
 
   /**
    * @brief Virtual Destructor.
    * Inlined as this is a pure abstract interface
    */
-  virtual ~RenderSurfaceInterface() {}
+  virtual ~RenderSurfaceInterface()
+  {
+  }
 
   /**
    * @brief Return the size and position of the surface.
@@ -97,7 +105,13 @@ public:
    * @param[out] dpiHorizontal set to the horizontal dpi
    * @param[out] dpiVertical set to the vertical dpi
    */
-  virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) = 0;
+  virtual void GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical) = 0;
+
+  /**
+   * @brief Return the orientation of the surface.
+   * @return The orientation
+   */
+  virtual int GetOrientation() const = 0;
 
   /**
    * @brief InitializeGraphics the platform specific graphics surface interfaces
@@ -124,7 +138,7 @@ public:
    * @brief Resizes the underlying surface.
    * @param[in] The dimensions of the new position
    */
-  virtual void MoveResize( Dali::PositionSize positionSize ) = 0;
+  virtual void MoveResize(Dali::PositionSize positionSize) = 0;
 
   /**
    * @brief Called when Render thread has started
@@ -136,9 +150,10 @@ public:
    * If the operation fails, then Core::Render should not be called until there is
    * a surface to render onto.
    * @param[in] resizingSurface True if the surface is being resized
+   * @param[in] damagedRects List of damaged rects this render pass
    * @return True if the operation is successful, False if the operation failed
    */
-  virtual bool PreRender( bool resizingSurface ) = 0;
+  virtual bool PreRender(bool resizingSurface, const std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect) = 0;
 
   /**
    * @brief Invoked by render thread after Core::Render
@@ -146,7 +161,8 @@ public:
    * @param[in] replacingSurface True if the surface is being replaced.
    * @param[in] resizingSurface True if the surface is being resized.
    */
-  virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) = 0;
+  virtual void PostRender(bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector<Rect<int>>& damagedRects) = 0;
+
   /**
    * @brief Invoked by render thread when the thread should be stop
    */
@@ -162,7 +178,7 @@ public:
    *
    * @param threadSynchronization The thread-synchronization implementation.
    */
-  virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) = 0;
+  virtual void SetThreadSynchronization(ThreadSynchronizationInterface& threadSynchronization) = 0;
 
   /**
    * @brief Gets the surface type
@@ -187,46 +203,61 @@ public:
   virtual Integration::StencilBufferAvailable GetStencilBufferRequired() = 0;
 
 public:
-
-  void SetAdaptor( Dali::Internal::Adaptor::AdaptorInternalServices& adaptor )
+  void SetAdaptor(Dali::Internal::Adaptor::AdaptorInternalServices& adaptor)
   {
     mAdaptor = &adaptor;
   }
 
-  void SetGraphicsInterface( Dali::Internal::Adaptor::GraphicsInterface& graphics )
+  void SetGraphicsInterface(Dali::Internal::Adaptor::GraphicsInterface& graphics)
   {
     mGraphics = &graphics;
   }
 
-  void SetDisplayConnection( Dali::DisplayConnection& displayConnection )
+  void SetDisplayConnection(Dali::DisplayConnection& displayConnection)
   {
     mDisplayConnection = &displayConnection;
   }
 
-private:
+  /**
+   * @brief Sets a Scene that is rendered on this surface.
+   * @param scene The Scene object
+   */
+  void SetScene(Dali::Integration::Scene& scene)
+  {
+    mScene = scene;
+  }
 
   /**
+   * @brief Forces full surface swap next frame, resets current partial update state.
+   */
+  void SetFullSwapNextFrame()
+  {
+    mFullSwapNextFrame = true;
+  }
+
+private:
+  /**
    * @brief Undefined copy constructor. RenderSurface cannot be copied
    */
-  RenderSurfaceInterface( const RenderSurfaceInterface& rhs );
+  RenderSurfaceInterface(const RenderSurfaceInterface& rhs);
 
   /**
    * @brief Undefined assignment operator. RenderSurface cannot be copied
    */
-  RenderSurfaceInterface& operator=( const RenderSurfaceInterface& rhs );
+  RenderSurfaceInterface& operator=(const RenderSurfaceInterface& rhs);
 
 protected:
-
   Dali::Internal::Adaptor::AdaptorInternalServices* mAdaptor;
-  Dali::Internal::Adaptor::GraphicsInterface* mGraphics;
-  Dali::DisplayConnection* mDisplayConnection;
+  Dali::Internal::Adaptor::GraphicsInterface*       mGraphics;
+  Dali::DisplayConnection*                          mDisplayConnection;
+  WeakHandle<Dali::Integration::Scene>              mScene;
+  bool                                              mFullSwapNextFrame; ///< Whether the full surface swap is required
 
 private:
+  Integration::DepthBufferAvailable   mDepthBufferRequired;   ///< Whether the depth buffer is required
+  Integration::StencilBufferAvailable mStencilBufferRequired; ///< Whether the stencil buffer is required
 
-  Integration::DepthBufferAvailable mDepthBufferRequired;       ///< Whether the depth buffer is required
-  Integration::StencilBufferAvailable mStencilBufferRequired;   ///< Whether the stencil buffer is required
-
-  Vector4 mBackgroundColor;                                     ///< The background color of the surface
+  Vector4 mBackgroundColor; ///< The background color of the surface
 };
 
 } // namespace Dali