Revert "[Tizen] Revert "Support multiple window rendering""

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / adaptor-internal-services.h

diff --git a/dali/internal/adaptor/common/adaptor-internal-services.h b/dali/internal/adaptor/common/adaptor-internal-services.h
index 5d52f9a..db4a360 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-internal-services.h
+++ b/dali/internal/adaptor/common/adaptor-internal-services.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H__
-#define __DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H__
+#ifndef DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H
+#define DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H
 
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
@@ -25,14 +25,16 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/trigger-event-interface.h>
 #include <dali/integration-api/trigger-event-factory-interface.h>
-#include <dali/internal/graphics/gles20/egl-factory-interface.h>
+#include <dali/integration-api/render-surface-interface.h>
+#include <dali/internal/window-system/common/display-connection.h>
+#include <dali/internal/graphics/common/graphics-interface.h>
+#include <dali/internal/graphics/gles/egl-factory-interface.h>
 #include <dali/internal/network/common/socket-factory-interface.h>
 #include <dali/internal/system/common/performance-interface.h>
 #include <dali/internal/graphics/common/vsync-monitor-interface.h>
 #include <dali/internal/network/common/trace-interface.h>
 #include <dali/integration-api/render-surface.h>
 
-
 namespace Dali
 {
 
@@ -61,23 +63,26 @@ public:
   /**
    * @return platform abstraction
    */
-  virtual Dali::Integration::PlatformAbstraction& GetPlatformAbstractionInterface()  = 0;
+  virtual Dali::Integration::PlatformAbstraction& GetPlatformAbstractionInterface() = 0;
 
   /**
-   * @return gles abstraction
+   * Used to access the Display Connection interface from the Render thread
+   * @return the Display Connection interface
    */
-  virtual Dali::Integration::GlAbstraction& GetGlesInterface()  = 0;
+  virtual Dali::DisplayConnection& GetDisplayConnectionInterface() = 0;
 
   /**
-   * @return egl factory
+   * Used to access the abstracted graphics interface
+   * This also contains the depth and stencil buffers
+   * @return the graphics interface
    */
-  virtual EglFactoryInterface& GetEGLFactoryInterface() const  = 0;
+  virtual GraphicsInterface& GetGraphicsInterface() = 0;
 
   /**
    * Used by update-thread to notify core (main-thread) it has messages to process
    * @return trigger event ProcessCoreEvents
    */
-  virtual TriggerEventInterface& GetProcessCoreEventsTrigger()  = 0;
+  virtual TriggerEventInterface& GetProcessCoreEventsTrigger() = 0;
 
   /**
    * @return trigger event factory interface
@@ -92,27 +97,27 @@ public:
   /**
    * @return render surface
    */
-  virtual RenderSurface* GetRenderSurfaceInterface()  = 0;
+  virtual Dali::RenderSurfaceInterface* GetRenderSurfaceInterface() = 0;
 
   /**
    * @return vsync monitor interface
    */
-  virtual VSyncMonitorInterface* GetVSyncMonitorInterface()  = 0;
+  virtual VSyncMonitorInterface* GetVSyncMonitorInterface() = 0;
 
   /**
    * @return performance interface
    */
-  virtual PerformanceInterface* GetPerformanceInterface()  = 0;
+  virtual PerformanceInterface* GetPerformanceInterface() = 0;
 
   /**
    * @return interface for logging to the kernel ( e.g. using ftrace )
    */
-  virtual TraceInterface& GetKernelTraceInterface()  = 0;
+  virtual TraceInterface& GetKernelTraceInterface() = 0;
 
   /**
    * @return system trace interface, e.g. for using Tizen Trace (ttrace) or Android Trace (atrace)
    */
-  virtual TraceInterface& GetSystemTraceInterface()  = 0;
+  virtual TraceInterface& GetSystemTraceInterface() = 0;
 
 
 protected:
@@ -132,10 +137,10 @@ protected:
   };
 
   // Undefined copy constructor.
-  AdaptorInternalServices( const AdaptorInternalServices& );
+  AdaptorInternalServices( const AdaptorInternalServices& ) = delete;
 
   // Undefined assignment operator.
-  AdaptorInternalServices& operator=( const AdaptorInternalServices& );
+  AdaptorInternalServices& operator=( const AdaptorInternalServices& ) = delete;
 };
 
 } // namespace Internal
@@ -144,4 +149,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H__
+#endif // DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H