changed timing of DisplayManager destry

Change-Id: Iee6b822d1836891a99c69c0c84c45f0dfc9f71d1
Signed-off-by: Dae Young Ryu <karzia@samsung.com>

diff --git a/src/ui/FUi_ControlManager.cpp b/src/ui/FUi_ControlManager.cpp
index d3ebbec..089eab7 100644 (file)
--- a/src/ui/FUi_ControlManager.cpp
+++ b/src/ui/FUi_ControlManager.cpp
@@ -408,13 +408,7 @@ _ControlManager::~_ControlManager(void)
 
 
        _IndicatorManager::ReleaseInstance();
-#ifdef VE_EFL
-       _DisplayManager::ReleaseInstance();
-       _AnimationManager::ReleaseInstance();
-#else
-       _GlDisplayManager::ReleaseInstance();
-       _AnimationManager::ReleaseInstance();
-#endif
+
        _AccessibilityManager::ReleaseInstance();
 
        _KeyEventManager::ReleaseInstance();
@@ -422,7 +416,13 @@ _ControlManager::~_ControlManager(void)
        _DimmingManager::ReleaseInstance();
        _UiEventManager::Release();
 
-
+#ifdef VE_EFL
+       _DisplayManager::ReleaseInstance();
+       _AnimationManager::ReleaseInstance();
+#else
+       _GlDisplayManager::ReleaseInstance();
+       _AnimationManager::ReleaseInstance();
+#endif
 }
 
 _Window*

diff --git a/src/ui/animations/FUiAnim_GlContext.cpp b/src/ui/animations/FUiAnim_GlContext.cpp
index 728ba60..46dc7b5 100644 (file)
--- a/src/ui/animations/FUiAnim_GlContext.cpp
+++ b/src/ui/animations/FUiAnim_GlContext.cpp
@@ -56,6 +56,14 @@ using namespace Tizen::Ui::Animations;
 
 #define PRINT printf
 
+#ifndef GL_BGRA_EXT
+#warning "GL_BGRA_EXT is not support. GL_BGRA_EXT is defined with GL_BGRA value."
+#ifndef GL_BGRA
+#error "GL_BGRA is not support"
+#endif
+#define GL_BGRA_EXT            GL_BGRA
+#endif
+
 namespace Tizen { namespace Ui { namespace Animations {
 
 #define NATIVE_PIXMAP_PADDING_VALUE            2       // depends on target
@@ -517,12 +525,7 @@ _GlContext::CreateTexture(Handle textureInfo)
        {
                if (IsSupportedBGRA())
                {
-#if defined(_OSP_EMUL_)
-                       //glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA, pTextureInfo->width, pTextureInfo->height, 0, GL_BGRA, GL_UNSIGNED_BYTE, pTextureInfo->pPixels);
-                       glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, pTextureInfo->width, pTextureInfo->height, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pTextureInfo->pPixels);
-#else
                        glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, pTextureInfo->width, pTextureInfo->height, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pTextureInfo->pPixels);
-#endif
                }
                else
                {
@@ -548,12 +551,7 @@ _GlContext::UploadTexture(Handle surfaceInfo)
        {
                if (IsSupportedBGRA())
                {
-#if defined(_OSP_EMUL_)
-                       //glTexSubImage2D(GL_TEXTURE_2D, 0, pSurfaceInfo->x, pSurfaceInfo->y, pSurfaceInfo->width, pSurfaceInfo->height, GL_BGRA, GL_UNSIGNED_BYTE, pSurfaceInfo->pPixels);
-                       glTexSubImage2D(GL_TEXTURE_2D, 0, pSurfaceInfo->x, pSurfaceInfo->y, pSurfaceInfo->width, pSurfaceInfo->height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pSurfaceInfo->pPixels);
-#else
                        glTexSubImage2D(GL_TEXTURE_2D, 0, pSurfaceInfo->x, pSurfaceInfo->y, pSurfaceInfo->width, pSurfaceInfo->height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pSurfaceInfo->pPixels);
-#endif
                }
                else
                {