From: Joogab Yun <joogab.yun@samsung.com>
Date: Mon, 8 Jul 2019 07:19:21 +0000 (+0900)
Subject: Revert "[Tizen] Use OpenGL es 2.0 if eglCreateContext is fail, Prevent glFinish witho... 
X-Git-Tag: submit/tizen/20190708.073346~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf82705c82c13f5524851e8af7d603d1c0aa57c4;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Revert "[Tizen] Use OpenGL es 2.0 if eglCreateContext is fail, Prevent glFinish without makeCurrent, Remove ifdef ARM in ChooseConfig"

This reverts commit 42f3204bda7eb518d520bc139e12e5150a713cd4.
---

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index 2185ed824..448676681 100644
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -445,15 +445,6 @@ 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();
@@ -462,10 +453,7 @@ void CombinedUpdateRenderController::UpdateRenderThread()
   if ( isSurfacelessContextSupported )
   {
     // Create a surfaceless OpenGL context for shared resources
-    if( eglImpl.GetContext() == 0 )
-    {
-      eglImpl.CreateContext();
-    }
+    eglImpl.CreateContext();
     eglImpl.MakeContextCurrent( EGL_NO_SURFACE, eglImpl.GetContext() );
   }
   else
diff --git a/dali/internal/graphics/gles/egl-implementation.cpp b/dali/internal/graphics/gles/egl-implementation.cpp
index d27fc9421..1cd3520c2 100755
--- a/dali/internal/graphics/gles/egl-implementation.cpp
+++ b/dali/internal/graphics/gles/egl-implementation.cpp
@@ -147,17 +147,6 @@ bool EglImplementation::CreateContext()
   DALI_ASSERT_ALWAYS( (mEglContext == 0) && "EGL context recreated" );
 
   mEglContext = eglCreateContext(mEglDisplay, mEglConfig, NULL, &(mContextAttribs[0]));
-  if ( eglGetError() != EGL_SUCCESS )
-  {
-    if( mGlesVersion >= 30 )
-    {
-      eglDestroySurface( mEglDisplay, mEglContext );
-      mEglContext = NULL;
-      mEglConfig = NULL;
-      DALI_LOG_ERROR("Fail to use OpenGL es 3.0. Retrying to use OpenGL es 2.0.");
-      return false;
-    }
-  }
   TEST_EGL_ERROR("eglCreateContext render thread");
 
   DALI_ASSERT_ALWAYS( EGL_NO_CONTEXT != mEglContext && "EGL context not created" );
@@ -222,10 +211,7 @@ void EglImplementation::MakeContextCurrent( EGLSurface eglSurface, EGLContext eg
 
   if(mIsOwnSurface)
   {
-    if( mCurrentEglContext != EGL_NO_CONTEXT )
-    {
-      glFinish();
-    }
+    glFinish();
 
     eglMakeCurrent( mEglDisplay, eglSurface, eglSurface, eglContext );
 
@@ -254,10 +240,7 @@ void EglImplementation::MakeCurrent( EGLNativePixmapType pixmap, EGLSurface eglS
 
   if(mIsOwnSurface)
   {
-    if( mCurrentEglContext != EGL_NO_CONTEXT )
-    {
-      glFinish();
-    }
+    glFinish();
 
     eglMakeCurrent( mEglDisplay, eglSurface, eglSurface, mEglContext );
 
@@ -365,7 +348,11 @@ bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
 
   if( mGlesVersion >= 30 )
   {
+#ifdef _ARCH_ARM_
     configAttribs.PushBack( EGL_OPENGL_ES3_BIT_KHR );
+#else
+    configAttribs.PushBack( EGL_OPENGL_ES2_BIT );
+#endif // _ARCH_ARM_
   }
   else
   {
@@ -412,7 +399,7 @@ bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
     if( mGlesVersion >= 30 )
     {
       mEglConfig = NULL;
-      DALI_LOG_ERROR("Fail to use OpenGL es 3.0. Retrying to use OpenGL es 2.0.");
+      DALI_LOG_ERROR("Fail to use OpenGL es 3.0. Retring to use OpenGL es 2.0.");
       return false;
     }