From 0e542d2c071b28da232aa2827a18935a01592484 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 8 Jul 2019 16:19:36 +0900 Subject: [PATCH] Revert "[Tizen] Fix video underlay issue" This reverts commit 8d7bce0c37ac45576bba33e4d23e0afca9a0ffd7. --- dali/internal/graphics/gles/egl-implementation.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dali/internal/graphics/gles/egl-implementation.cpp b/dali/internal/graphics/gles/egl-implementation.cpp index 1cd3520..76fa78a 100755 --- 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 ); -- 2.7.4