Remove init check code

Change-Id: Id7ae90959daf0896bf460ea06dcffd351f62e859

diff --git a/src/ui/animations/FUiAnim_GlLoader.cpp b/src/ui/animations/FUiAnim_GlLoader.cpp
index f810c18..cf74a72 100644 (file)
--- a/src/ui/animations/FUiAnim_GlLoader.cpp
+++ b/src/ui/animations/FUiAnim_GlLoader.cpp
@@ -36,7 +36,8 @@
 
 #include <FBaseSysLog.h>
 
-//#include "FUiAnim_GlLoader.h"
+#include "FUiAnim_GlLoader.h"
+
 //#define PRINT(...) fprintf(stderr, __VA_ARGS__)
 #define PRINT(...)
 
@@ -45,6 +46,7 @@ using namespace Tizen::Base;
 namespace Tizen { namespace Ui { namespace Animations
 {
 
+#if 0
 #define _GLES_CHECK_INTERFACE_VOID_2 if (!_GlesInterfaceInitialize()) \
        { \
                return; \
@@ -69,6 +71,14 @@ namespace Tizen { namespace Ui { namespace Animations
        { \
                return -1; \
        }
+#else
+#define _GLES_CHECK_INTERFACE_VOID_2
+#define _GLES_CHECK_INTERFACE_GLBOOLEAN_2
+#define _GLES_CHECK_INTERFACE_GLENUM_2
+#define _GLES_CHECK_INTERFACE_CONSTGLUBYTEP_2
+#define _GLES_CHECK_INTERFACE_GLUINT_2
+#define _GLES_CHECK_INTERFACE_INT_2
+#endif
 
 struct _GlesInterface2
 {

diff --git a/src/ui/animations/FUiAnim_GlLoader.h b/src/ui/animations/FUiAnim_GlLoader.h
index f60c10d..19b686c 100644 (file)
--- a/src/ui/animations/FUiAnim_GlLoader.h
+++ b/src/ui/animations/FUiAnim_GlLoader.h
@@ -28,9 +28,18 @@
 namespace Tizen { namespace Ui { namespace Animations
 {
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 bool _GlesInterfaceInitialize(void);
 void _GlesInterfaceTerminate(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 }}}            // Tizen::Ui::Animations
 
 #endif //FUI_ANIM_INTERNAL_GLLOADER_H_

diff --git a/src/ui/animations/FUiAnim_GlRenderManager.cpp b/src/ui/animations/FUiAnim_GlRenderManager.cpp
index 8c13cd9..55c1bdc 100644 (file)
--- a/src/ui/animations/FUiAnim_GlRenderManager.cpp
+++ b/src/ui/animations/FUiAnim_GlRenderManager.cpp
@@ -26,8 +26,10 @@
 #include <FBaseErrors.h>
 #include <FBaseSysLog.h>
 #include <FUiAnimShader.h>
-
 #include <FUiAnimShaderProgram.h>
+#include <FUiAnimView.h>
+#include <FUiAnimCamera.h>
+
 #include "FBase_StringConverter.h"
 #include "FGrpFloatRectangle.h"
 
@@ -35,8 +37,6 @@
 #include "FUiAnim_VisualElementImpl.h"
 #include "FUiAnim_VisualElementEnvironment.h"
 
-#include <FUiAnimView.h>
-#include <FUiAnimCamera.h>
 #include "FUiAnim_CameraImpl.h"
 #include "FUiAnim_ViewInfo.h"
 #include "FUiAnim_ViewImpl.h"
@@ -55,9 +55,9 @@
 #include "FUiAnimMaterial.h"
 #include "FUiAnim_LightImpl.h"
 #include "FUiAnim_MaterialImpl.h"
-
 #include "FUiAnim_MeshControllerImpl.h" //skinning
 
+#include "FUiAnim_GlLoader.h"
 #include "FUiAnim_Debug.h"
 
 #ifdef _WIN32
@@ -1244,7 +1244,8 @@ _GlRenderManager::FlushRenderQueue(void)
 
                        if (!__pRenderQueue[i].__isMesh || __pRenderQueue[i].__isTexUpdated)
                        {
-                               __pGlContext->UpdateTexture(__pRenderQueue[i].__pSurfaceInfo);  //TODO Update?\88ì\97\90??bindë¥??´ì£¼ë©??\88ë\90\98?\94ê??
+                               __pGlContext->UpdateTexture(__pRenderQueue[i].__pSurfaceInfo);
+
                                __pRenderQueue[i].__isTexUpdated = false;
                        }
                }
@@ -2081,6 +2082,8 @@ _GlRenderManager::RenderProc(void* pData)
 
        _GlRenderManager* pThis = reinterpret_cast< _GlRenderManager* >(pData);
 
+       _GlesInterfaceInitialize();
+
 #ifndef VE_USE_GL_MULTI_CONTEXT
 #ifdef ECORE_X_NATIVE
        _EcoreXLooper* pLooper = static_cast<_EcoreXLooper*>(_Looper::GetInstance());
@@ -2227,6 +2230,8 @@ exit_renderer:
        pThis->__pGlContext = null;
 #endif
 
+       _GlesInterfaceTerminate();
+
        {
                _AutoMutex commandLock(pThis->__commandLock);