X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fcommon%2Fwindow-render-surface.cpp;h=2ff7944ebb1ab1bfede7e3fe81207ba24cf4dc4a;hp=cac09c5fc15d6c5dd25dca813a55152532aded53;hb=263ec21432f3d7c9f9be5b463748fdce8f6942e4;hpb=43235b18c881038f256cc7ebdbaa13d0930122c6

diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp
index cac09c5..2ff7944 100644
--- a/dali/internal/window-system/common/window-render-surface.cpp
+++ b/dali/internal/window-system/common/window-render-surface.cpp
@@ -27,6 +27,7 @@
 #include <dali/integration-api/thread-synchronization-interface.h>
 #include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/window-system/common/window-base.h>
 #include <dali/internal/window-system/common/window-factory.h>
 #include <dali/internal/window-system/common/window-system.h>
@@ -58,6 +59,8 @@ WindowRenderSurface::WindowRenderSurface( Dali::PositionSize positionSize, Any s
   mRenderNotification( NULL ),
   mRotationTrigger( NULL ),
   mGraphics( nullptr ),
+  mEGLSurface( nullptr ),
+  mEGLContext( nullptr ),
   mColorDepth( isTransparent ? COLOR_DEPTH_32 : COLOR_DEPTH_24 ),
   mOutputTransformedSignal(),
   mRotationAngle( 0 ),
@@ -177,28 +180,24 @@ void WindowRenderSurface::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpi
   mWindowBase->GetDpi( dpiHorizontal, dpiVertical );
 }
 
-void WindowRenderSurface::InitializeGraphics( GraphicsInterface& graphics, Dali::DisplayConnection& displayConnection )
+void WindowRenderSurface::InitializeGraphics()
 {
-  mGraphics = &graphics;
 
-  auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
-
-  EglInterface* mEGL = eglGraphics->Create();
-
-  // Initialize EGL & OpenGL
-  displayConnection.Initialize();
+  mGraphics = &mAdaptor->GetGraphicsInterface();
 
-  Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>(*mEGL);
-  eglImpl.ChooseConfig(true, mColorDepth);
-
-  // Create the OpenGL context
-  mEGL->CreateContext();
+  auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
+  mEGL = &eglGraphics->GetEglInterface();
 
-  // Create the OpenGL surface
-  CreateSurface();
+  if ( mEGLContext == NULL )
+  {
+    // Create the OpenGL context for this window
+    Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>(*mEGL);
+    eglImpl.ChooseConfig(true, mColorDepth);
+    eglImpl.CreateWindowContext( mEGLContext );
 
-  // Make it current
-  mEGL->MakeContextCurrent();
+    // Create the OpenGL surface
+    CreateSurface();
+  }
 }
 
 void WindowRenderSurface::CreateSurface()
@@ -223,7 +222,7 @@ void WindowRenderSurface::CreateSurface()
   auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
 
   Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation();
-  eglImpl.CreateSurfaceWindow( window, mColorDepth );
+  mEGLSurface = eglImpl.CreateSurfaceWindow( window, mColorDepth );
 
   // Check rotation capability
   mRotationSupported = mWindowBase->IsEglWindowRotationSupported();
@@ -238,7 +237,7 @@ void WindowRenderSurface::DestroySurface()
   auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
 
   Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation();
-  eglImpl.DestroySurface();
+  eglImpl.DestroySurface( mEGLSurface );
 
   mWindowBase->DestroyEglWindow();
 }
@@ -271,7 +270,7 @@ bool WindowRenderSurface::ReplaceGraphicsSurface()
   auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
 
   Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation();
-  return eglImpl.ReplaceSurfaceWindow( window );
+  return eglImpl.ReplaceSurfaceWindow( window, mEGLSurface, mEGLContext );
 }
 
 void WindowRenderSurface::MoveResize( Dali::PositionSize positionSize )
@@ -326,6 +325,8 @@ void WindowRenderSurface::StartRender()
 
 bool WindowRenderSurface::PreRender( bool resizingSurface )
 {
+  MakeContextCurrent();
+
   if( resizingSurface )
   {
 #ifdef OVER_TIZEN_VERSION_4
@@ -404,7 +405,7 @@ void WindowRenderSurface::PostRender( bool renderToFbo, bool replacingSurface, b
     }
 
     Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation();
-    eglImpl.SwapBuffers();
+    eglImpl.SwapBuffers( mEGLSurface );
 
     if( mRenderNotification )
     {
@@ -429,11 +430,29 @@ void WindowRenderSurface::ReleaseLock()
   // Nothing to do.
 }
 
-RenderSurface::Type WindowRenderSurface::GetSurfaceType()
+Integration::RenderSurface::Type WindowRenderSurface::GetSurfaceType()
 {
   return RenderSurface::WINDOW_RENDER_SURFACE;
 }
 
+void WindowRenderSurface::MakeContextCurrent()
+{
+  if ( mEGL != nullptr )
+  {
+    mEGL->MakeContextCurrent( mEGLSurface, mEGLContext );
+  }
+}
+
+Integration::DepthBufferAvailable WindowRenderSurface::GetDepthBufferRequired()
+{
+  return mGraphics ? mGraphics->GetDepthBufferRequired() : Integration::DepthBufferAvailable::FALSE;
+}
+
+Integration::StencilBufferAvailable WindowRenderSurface::GetStencilBufferRequired()
+{
+  return mGraphics ? mGraphics->GetStencilBufferRequired() : Integration::StencilBufferAvailable::FALSE;
+}
+
 void WindowRenderSurface::OutputTransformed()
 {
   int screenRotationAngle = mWindowBase->GetScreenRotationAngle();