Revert "[Tizen] Fix video underlay issue"

[platform/core/uifw/dali-adaptor.git] / dali / internal / graphics / gles / egl-implementation.cpp

diff --git a/dali/internal/graphics/gles/egl-implementation.cpp b/dali/internal/graphics/gles/egl-implementation.cpp
index a9c5804..68d7925 100755 (executable)
--- a/dali/internal/graphics/gles/egl-implementation.cpp
+++ b/dali/internal/graphics/gles/egl-implementation.cpp
@@ -156,17 +156,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" );
@@ -352,6 +341,8 @@ bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
     return true;
   }
 
+  bool isTransparent = ( depth == COLOR_DEPTH_32 );
+
   mColorDepth = depth;
   mIsWindow = isWindowType;
 
@@ -392,10 +383,18 @@ bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
   configAttribs.PushBack( EGL_BLUE_SIZE );
   configAttribs.PushBack( 8 );
 
-  // In the previous code, there was a branch for ARM.
-  // If there is an issue in only ARM, we need to check here again.
-  configAttribs.PushBack( EGL_ALPHA_SIZE );
-  configAttribs.PushBack( 8 );
+  if ( isTransparent )
+  {
+    configAttribs.PushBack( EGL_ALPHA_SIZE );
+#ifdef _ARCH_ARM_
+    // For underlay video playback, we also need to set the alpha value of the 24/32bit window.
+    configAttribs.PushBack( 8 );
+#else
+    // There is a bug in the desktop emulator
+    // setting EGL_ALPHA_SIZE to 8 results in eglChooseConfig failing
+    configAttribs.PushBack( 8 );
+#endif // _ARCH_ARM_
+  }
 
   configAttribs.PushBack( EGL_DEPTH_SIZE );
   configAttribs.PushBack( mDepthBufferRequired ? 24 : 0 );