X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fcombined-update-render-controller.cpp;h=2185ed824d6311fb62f2bddce8eafc69d2bf72ad;hb=02a0b6a8425ee880dcf8e8a4d5dd5b6d79c38fe4;hp=448676681d0252782da9741eccc8b8146d887a72;hpb=ade28fa1eba5b6bc1e22034cd88df32df0b7919e;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index 4486766..2185ed8 100644
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -445,6 +445,15 @@ void CombinedUpdateRenderController::UpdateRenderThread()
     eglGraphics->SetGlesVersion( 20 );
     eglImpl.ChooseConfig( true, COLOR_DEPTH_32 );
   }
+  else
+  {
+    if( !eglImpl.CreateContext() )
+    {
+      // Retry to use OpenGL es 2.0
+      eglGraphics->SetGlesVersion( 20 );
+      eglImpl.ChooseConfig( true, COLOR_DEPTH_32 );
+    }
+  }
 
   // Check whether surfaceless context is supported
   bool isSurfacelessContextSupported = eglImpl.IsSurfacelessContextSupported();
@@ -453,7 +462,10 @@ void CombinedUpdateRenderController::UpdateRenderThread()
   if ( isSurfacelessContextSupported )
   {
     // Create a surfaceless OpenGL context for shared resources
-    eglImpl.CreateContext();
+    if( eglImpl.GetContext() == 0 )
+    {
+      eglImpl.CreateContext();
+    }
     eglImpl.MakeContextCurrent( EGL_NO_SURFACE, eglImpl.GetContext() );
   }
   else