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" );
if(mIsOwnSurface)
{
- glFinish();
+ if( mCurrentEglContext != EGL_NO_CONTEXT )
+ {
+ glFinish();
+ }
eglMakeCurrent( mEglDisplay, eglSurface, eglSurface, eglContext );
if(mIsOwnSurface)
{
- glFinish();
+ if( mCurrentEglContext != EGL_NO_CONTEXT )
+ {
+ glFinish();
+ }
eglMakeCurrent( mEglDisplay, eglSurface, eglSurface, mEglContext );
return true;
}
- bool isTransparent = ( depth == COLOR_DEPTH_32 );
-
mColorDepth = depth;
mIsWindow = isWindowType;
if( mGlesVersion >= 30 )
{
-#ifdef _ARCH_ARM_
configAttribs.PushBack( EGL_OPENGL_ES3_BIT_KHR );
-#else
- configAttribs.PushBack( EGL_OPENGL_ES2_BIT );
-#endif // _ARCH_ARM_
}
else
{
configAttribs.PushBack( EGL_BLUE_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_
- }
+ // 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 );
configAttribs.PushBack( EGL_DEPTH_SIZE );
configAttribs.PushBack( mDepthBufferRequired ? 24 : 0 );
#endif // DALI_PROFILE_UBUNTU
configAttribs.PushBack( EGL_NONE );
- if ( eglChooseConfig( mEglDisplay, &(configAttribs[0]), &mEglConfig, 1, &numConfigs ) != EGL_TRUE )
+ // Ensure number of configs is set to 1 as on some drivers,
+ // eglChooseConfig succeeds but does not actually create a proper configuration.
+ if ( ( eglChooseConfig( mEglDisplay, &(configAttribs[0]), &mEglConfig, 1, &numConfigs ) != EGL_TRUE ) ||
+ ( numConfigs != 1 ) )
{
if( mGlesVersion >= 30 )
{
mEglConfig = NULL;
- DALI_LOG_ERROR("Fail to use OpenGL es 3.0. Retring to use OpenGL es 2.0.");
+ DALI_LOG_ERROR("Fail to use OpenGL es 3.0. Retrying to use OpenGL es 2.0.");
return false;
}
+ if ( numConfigs != 1 )
+ {
+ DALI_LOG_ERROR("No configurations found.\n");
+
+ TEST_EGL_ERROR("eglChooseConfig");
+ }
+
EGLint error = eglGetError();
switch (error)
{
}
mContextAttribs.PushBack( EGL_NONE );
- if ( numConfigs != 1 )
- {
- DALI_LOG_ERROR("No configurations found.\n");
-
- TEST_EGL_ERROR("eglChooseConfig");
- }
-
return true;
}
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;
}