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 2ac0a63..76fa78a 100755 (executable)
--- a/dali/internal/graphics/gles/egl-implementation.cpp
+++ b/dali/internal/graphics/gles/egl-implementation.cpp
@@ -326,6 +326,8 @@ bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
     return true;
   }
 
+  bool isTransparent = ( depth == COLOR_DEPTH_32 );
+
   mColorDepth = depth;
   mIsWindow = isWindowType;
 
@@ -370,10 +372,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 );
@@ -509,10 +519,10 @@ bool EglImplementation::ReplaceSurfaceWindow( EGLNativeWindowType window, EGLSur
   DestroySurface( eglSurface );
 
   // create the EGL surface
-  CreateSurfaceWindow( window, mColorDepth );
+  EGLSurface newEglSurface = CreateSurfaceWindow( window, mColorDepth );
 
   // set the context to be current with the new surface
-  MakeContextCurrent( eglSurface, eglContext );
+  MakeContextCurrent( newEglSurface, eglContext );
 
   return contextLost;
 }