Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / adaptors / x11 / display-connection-impl-x.cpp

diff --git a/adaptors/x11/display-connection-impl-x.cpp b/adaptors/x11/display-connection-impl-x.cpp
index 02deebb..b917458 100644 (file)
--- a/adaptors/x11/display-connection-impl-x.cpp
+++ b/adaptors/x11/display-connection-impl-x.cpp
@@ -44,8 +44,6 @@ DisplayConnection* DisplayConnection::New()
 DisplayConnection::DisplayConnection()
 : mDisplay(NULL)
 {
-  // Because of DDK issue, we need to use separated x display instead of ecore default display
-  mDisplay = XOpenDisplay(0);
 }
 
 DisplayConnection::~DisplayConnection()
@@ -88,13 +86,22 @@ bool DisplayConnection::InitializeEgl(EglInterface& egl)
 
   if (!eglImpl.InitializeGles(reinterpret_cast<EGLNativeDisplayType>(mDisplay)))
   {
-    DALI_LOG_ERROR("Failed to initialize GLES.");
+    DALI_LOG_ERROR("Failed to initialize GLES.\n");
     return false;
   }
 
   return true;
 }
 
+void DisplayConnection::SetSurfaceType( RenderSurface::Type type )
+{
+  if( type == RenderSurface::ECORE_RENDER_SURFACE )
+  {
+    // Because of DDK issue, we need to use separated x display instead of ecore default display
+    mDisplay = XOpenDisplay(0);
+  }
+}
+
 void DisplayConnection::GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical)
 {
   // calculate DPI