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 );
if( mGlesVersion >= 30 )
{
-#ifdef _ARCH_ARM_
configAttribs.PushBack( EGL_OPENGL_ES3_BIT_KHR );
-#else
- configAttribs.PushBack( EGL_OPENGL_ES2_BIT );
-#endif // _ARCH_ARM_
}
else
{
}
#endif // DALI_PROFILE_UBUNTU
configAttribs.PushBack( EGL_NONE );
+
+ // 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;
}