From 3f799e22e05a38a90ac284dd2066a6f5842d6ccc Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Mon, 15 Jul 2019 14:57:59 +0900 Subject: [PATCH] Revert "[Tizen] Use OpenGL es 2.0 if eglCreateContext is fail, Prevent glFinish without makeCurrent, Remove ifdef ARM in ChooseConfig" This reverts commit 06f3b1493bab14d48356e20d0f0c4e06ba6fc28a. --- .../adaptor/common/combined-update-render-controller.cpp | 14 +------------- dali/internal/graphics/gles/egl-implementation.cpp | 11 ----------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp index 2185ed8..4486766 100644 --- a/dali/internal/adaptor/common/combined-update-render-controller.cpp +++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp @@ -445,15 +445,6 @@ void CombinedUpdateRenderController::UpdateRenderThread() eglGraphics->SetGlesVersion( 20 ); eglImpl.ChooseConfig( true, COLOR_DEPTH_32 ); } - else - { - if( !eglImpl.CreateContext() ) - { - // Retry to use OpenGL es 2.0 - eglGraphics->SetGlesVersion( 20 ); - eglImpl.ChooseConfig( true, COLOR_DEPTH_32 ); - } - } // Check whether surfaceless context is supported bool isSurfacelessContextSupported = eglImpl.IsSurfacelessContextSupported(); @@ -462,10 +453,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() if ( isSurfacelessContextSupported ) { // Create a surfaceless OpenGL context for shared resources - if( eglImpl.GetContext() == 0 ) - { - eglImpl.CreateContext(); - } + eglImpl.CreateContext(); eglImpl.MakeContextCurrent( EGL_NO_SURFACE, eglImpl.GetContext() ); } else diff --git a/dali/internal/graphics/gles/egl-implementation.cpp b/dali/internal/graphics/gles/egl-implementation.cpp index a9c5804..b8a42f7 100755 --- 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" ); -- 2.7.4