projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen]Fallback to GLES 2.0 when num_config is 0"
[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
7147bfe
..
91d4fab
100755
(executable)
--- a/
dali/internal/graphics/gles/egl-implementation.cpp
+++ b/
dali/internal/graphics/gles/egl-implementation.cpp
@@
-400,8
+400,8
@@
bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
}
#endif // DALI_PROFILE_UBUNTU
configAttribs.PushBack( EGL_NONE );
}
#endif // DALI_PROFILE_UBUNTU
configAttribs.PushBack( EGL_NONE );
- if ( ( eglChooseConfig( mEglDisplay, &(configAttribs[0]), &mEglConfig, 1, &numConfigs ) != EGL_TRUE ) ||
-
( numConfigs != 1 )
)
+
+
if ( eglChooseConfig( mEglDisplay, &(configAttribs[0]), &mEglConfig, 1, &numConfigs ) != EGL_TRUE
)
{
if( mGlesVersion >= 30 )
{
{
if( mGlesVersion >= 30 )
{
@@
-410,13
+410,6
@@
bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
return false;
}
return false;
}
- if ( numConfigs != 1 )
- {
- DALI_LOG_ERROR("No configurations found.\n");
-
- TEST_EGL_ERROR("eglChooseConfig");
- }
-
EGLint error = eglGetError();
switch (error)
{
EGLint error = eglGetError();
switch (error)
{
@@
-467,6
+460,13
@@
bool EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
}
mContextAttribs.PushBack( EGL_NONE );
}
mContextAttribs.PushBack( EGL_NONE );
+ if ( numConfigs != 1 )
+ {
+ DALI_LOG_ERROR("No configurations found.\n");
+
+ TEST_EGL_ERROR("eglChooseConfig");
+ }
+
return true;
}
return true;
}