X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fgraphics%2Fgles%2Fegl-implementation.h;h=3c75e3bc9aa7e6bba4c5ac2979d441882afe766f;hb=cbc41a9b327649c3289cf312dbf39f6160762615;hp=eeb33e3fa4cd1a4468d0801e6ce6656bbf72c1fc;hpb=361480c3a72b189b3c11980de011d233b4aea721;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/graphics/gles/egl-implementation.h b/dali/internal/graphics/gles/egl-implementation.h
index eeb33e3..3c75e3b 100644
--- a/dali/internal/graphics/gles/egl-implementation.h
+++ b/dali/internal/graphics/gles/egl-implementation.h
@@ -22,6 +22,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/integration-api/core-enumerations.h>
 
 // INTERNAL INCLUDES
@@ -69,25 +70,31 @@ public:
   bool InitializeGles( EGLNativeDisplayType display, bool isOwnSurface = true );
 
   /**
-    * Create the OpenGL context.
+    * Create the OpenGL context for the shared resource.
     * @return true if successful
     */
   virtual bool CreateContext();
 
   /**
+    * Create the OpenGL context for the window.
+    * @return true if successful
+    */
+  bool CreateWindowContext( EGLContext& mEglContext );
+
+  /**
     * Destroy the OpenGL context.
     */
-  void DestroyContext();
+  void DestroyContext( EGLContext& eglContext );
 
   /**
     * Destroy the OpenGL surface.
     */
-  void DestroySurface();
+  void DestroySurface( EGLSurface& eglSurface );
 
   /**
    * Make the OpenGL context current
    */
-  virtual void MakeContextCurrent();
+  virtual void MakeContextCurrent( EGLSurface eglSurface, EGLContext eglContext );
 
   /**
    * clear the OpenGL context
@@ -116,12 +123,12 @@ public:
   /**
    * Performs an OpenGL swap buffers command
    */
-  virtual void SwapBuffers();
+  virtual void SwapBuffers( EGLSurface& eglSurface );
 
   /**
    * Performs an OpenGL copy buffers command
    */
-  virtual void CopyBuffers();
+  virtual void CopyBuffers( EGLSurface& eglSurface );
 
   /**
    * Performs an EGL wait GL command
@@ -139,9 +146,9 @@ public:
     * Create an OpenGL surface using a window
     * @param window The window to create the surface on
     * @param colorDepth Bit per pixel value (ex. 32 or 24)
-    * @return true on success, false on failure
+    * @return Handle to an on-screen EGL window surface (the requester has an ownership of this egl surface)
     */
-  void CreateSurfaceWindow( EGLNativeWindowType window, ColorDepth depth );
+  EGLSurface CreateSurfaceWindow( EGLNativeWindowType window, ColorDepth depth );
 
   /**
    * Create the OpenGL surface using a pixmap
@@ -157,7 +164,7 @@ public:
    * @return true if the context was lost due to a change in display
    *         between old surface and new surface
    */
-  bool ReplaceSurfaceWindow( EGLNativeWindowType window );
+  bool ReplaceSurfaceWindow( EGLNativeWindowType window, EGLSurface& eglSurface, EGLContext& eglContext );
 
   /**
    * Replaces the render surface
@@ -192,8 +199,16 @@ private:
 
   EGLDisplay           mEglDisplay;
   EGLConfig            mEglConfig;
-  EGLContext           mEglContext;
+  EGLContext           mEglContext;                            ///< The resource context holding assets such as textures to be shared
+
+  typedef std::vector<EGLContext> EglWindowContextContainer;
+  EglWindowContextContainer mEglWindowContexts;                ///< The EGL context for the window
+
   EGLSurface           mCurrentEglSurface;
+  EGLContext           mCurrentEglContext;
+
+  typedef std::vector<EGLSurface> EglWindowSurfaceContainer;
+  EglWindowSurfaceContainer mEglWindowSurfaces;                ///< The EGL surface for the window
 
   int                  mMultiSamplingLevel;
 
@@ -201,7 +216,6 @@ private:
 
   bool                 mGlesInitialized;
   bool                 mIsOwnSurface;
-  bool                 mContextCurrent;
   bool                 mIsWindow;
   bool                 mDepthBufferRequired;
   bool                 mStencilBufferRequired;