From 657288a5a164e50ecd3409a3d20755ac2e8adfa0 Mon Sep 17 00:00:00 2001 From: Sukwon Suh Date: Mon, 12 Aug 2013 19:24:42 +0900 Subject: [PATCH] fix log bugs Change-Id: I122a73e932e7c09420d9f868a605d1beebdfdf00 Signed-off-by: Sukwon Suh --- src/graphics/opengl/FGrpEgl.cpp | 58 ++++++++++++++++++------------- src/graphics/opengl/FGrp_VideoTexture.cpp | 4 +-- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/src/graphics/opengl/FGrpEgl.cpp b/src/graphics/opengl/FGrpEgl.cpp index 573f27f..0e08a1d 100644 --- a/src/graphics/opengl/FGrpEgl.cpp +++ b/src/graphics/opengl/FGrpEgl.cpp @@ -511,7 +511,7 @@ public: _SglInfoTableManipulator() { result r = __SglMutex.Create(); - SysTryLog(NID_GRP, r == E_SUCCESS, "Failed to create mutex. [%s]", GetErrorMessage(r)); + SysTryLog(NID_GRP, r == E_SUCCESS, "[%s] Failed to create mutex.", GetErrorMessage(r)); __SglIndexLastUsed = INVALID_SGL_INDEX; __SglInitialized = false; } @@ -778,14 +778,14 @@ _GetEvasEngineType(Evas_Object* pObject) Evas* pEvas = evas_object_evas_get(pObject); if (pEvas == null) { - SysLogException(NID_GRP, E_OPERATION_FAILED, "Getting pEvas failed."); + SysLogException(NID_GRP, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Getting pEvas failed."); return ENGINE_TYPE_SOFEWARE_X11; } Ecore_Evas* pEcoreEvas = ecore_evas_ecore_evas_get(pEvas); if (pEcoreEvas == null) { - SysLogException(NID_GRP, E_OPERATION_FAILED, "Getting pEcoreEvas failed."); + SysLogException(NID_GRP, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Getting pEcoreEvas failed."); return ENGINE_TYPE_SOFEWARE_X11; } @@ -820,7 +820,7 @@ _EvasObjectImageChange(_SglInfo* pSglInfo) Evas* pEvas = evas_object_evas_get(pSglInfo->pObject); if (pEvas == null) { - SysLogException(NID_GRP, E_OPERATION_FAILED, "Getting pEvas failed."); + SysLogException(NID_GRP, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Getting pEvas failed."); return; } @@ -1135,22 +1135,24 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi Object* pObj = (Object*)win; VisualElement* pVisualElement = dynamic_cast (pObj); Tizen::Ui::Control* pControl = dynamic_cast (pObj); -#if 0//!defined(_OSP_EMUL_) + +//#define FGRAPHICS_INTERNAL_USE_WINDOWSURFACE +#if FGRAPHICS_INTERNAL_USE_WINDOWSURFACE Tizen::Ui::Controls::Frame* pFrame = dynamic_cast (pControl); #endif - SysTryReturn(NID_GRP, pControl != null || pVisualElement != null, EGL_NO_SURFACE, E_INVALID_ARG, "Invalid NativeWindow."); + SysTryReturn(NID_GRP, pControl != null || pVisualElement != null, EGL_NO_SURFACE, E_INVALID_ARG, "[E_INVALID_ARG] Invalid NativeWindow."); _SglInfoTableManipulator* pSglInfoTableManipulatorInstance = _SglInfoTableManipulator::GetInstance(); -#if 0//!defined(_OSP_EMUL_) +#if FGRAPHICS_INTERNAL_USE_WINDOWSURFACE if (pFrame != null && _GetEvasEngineType(null) != ENGINE_TYPE_OPENGL_X11) { _ControlImpl* pControlImpl = _ControlImpl::GetInstance(*pControl); _WindowImpl* pWindowImpl = dynamic_cast<_WindowImpl*> (pControlImpl); - SysTryReturn(NID_GRP, pWindowImpl != null, EGL_NO_SURFACE, E_INVALID_STATE, "Invalid window state."); + SysTryReturn(NID_GRP, pWindowImpl != null, EGL_NO_SURFACE, E_INVALID_STATE, "[E_INVALID_STATE] Invalid window state."); EGLNativeWindowType nativeWindow = (EGLNativeWindowType)pWindowImpl->GetNativeHandle(); sglIndex = pSglInfoTableManipulatorInstance->CreateSglIndex(); - SysTryReturn(NID_GRP, sglIndex > INVALID_SGL_INDEX, EGL_NO_SURFACE, E_OPERATION_FAILED, "Invalid SglIndex."); + SysTryReturn(NID_GRP, sglIndex > INVALID_SGL_INDEX, EGL_NO_SURFACE, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Invalid SglIndex."); EGLSurface windowSurface = eglCreateWindowSurface(dpy, config, nativeWindow, pAttribList); if (windowSurface == EGL_NO_SURFACE) @@ -1184,7 +1186,7 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi return (EGLSurface)sglIndex; } else -#endif //#if !defined(_OSP_EMUL_) +#endif //#if FGRAPHICS_INTERNAL_USE_WINDOWSURFACE { result r = E_SUCCESS; @@ -1192,15 +1194,15 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi { pVisualElement = pControl->GetVisualElement(); } - SysTryReturn(NID_GRP, pVisualElement != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "Propagating."); + SysTryReturn(NID_GRP, pVisualElement != null, EGL_NO_SURFACE, E_INVALID_ARG, "[E_INVALID_ARG] Invalid NativeWindow."); _VisualElementImpl* pVisualElementImpl = _VisualElementImpl::GetInstance(*pVisualElement); - SysTryReturn(NID_GRP, pVisualElementImpl != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "Propagating."); + SysTryReturn(NID_GRP, pVisualElementImpl != null, EGL_NO_SURFACE, E_INVALID_ARG, "[E_INVALID_ARG] Invalid NativeWindow."); FloatRectangle rect = pVisualElement->GetBounds(); int width = int(rect.width); int height = int(rect.height); - SysTryReturn(NID_GRP, width > 0 && height > 0, EGL_NO_SURFACE, E_OUT_OF_RANGE, "Invalid size. w:%d h:%d", width, height); + SysTryReturn(NID_GRP, width > 0 && height > 0, EGL_NO_SURFACE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] Invalid size. w:%d h:%d", width, height); Control* pFrame = pControl; Control* pTemp = pFrame->GetParent(); @@ -1211,10 +1213,12 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi } Tizen::Ui::Window* pWindow = dynamic_cast (pFrame); - SysTryReturn(NID_GRP, pWindow != null, EGL_NO_SURFACE, E_INVALID_STATE, "Invalid window."); + SysTryReturn(NID_GRP, pWindow != null, EGL_NO_SURFACE, E_INVALID_STATE, "[E_INVALID_STATE] Invalid window."); VisualElementSurface* pVisualElementSurface = pVisualElement->GetSurfaceN(); - SysTryReturn(NID_GRP, pVisualElementSurface != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "Propagating."); + r = GetLastResult(); + SysTryReturn(NID_GRP, r == E_SUCCESS, EGL_NO_SURFACE, r, "[%s] Propagating.", GetErrorMessage(r)); + SysTryReturn(NID_GRP, pVisualElementSurface != null, EGL_NO_SURFACE, E_INVALID_STATE, "[E_INVALID_STATE] Getting VisualElementSurface failed."); _VisualElementSurfaceImpl* pVisualElementSurfaceImpl = _VisualElementSurfaceImpl::GetInstance(*pVisualElementSurface); if (pVisualElementSurfaceImpl == null) @@ -1229,7 +1233,7 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi Evas* pEvas = evas_object_evas_get(pObject); pObject = evas_object_image_filled_add(pEvas); - SysTryReturn(NID_GRP, pObject != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "Invalid object."); + SysTryReturn(NID_GRP, pObject != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Invalid object."); __evasEngineType = _GetEvasEngineType(pObject); @@ -1243,16 +1247,18 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi pVisualElementSurface = _VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN( *pWindow->GetDisplayContext(), (Handle)pObject, Dimension(width, height)); - SysTryReturn(NID_GRP, pVisualElementSurface != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "Propagating."); + r = GetLastResult(); + SysTryReturn(NID_GRP, r == E_SUCCESS, EGL_NO_SURFACE, r, "[%s] Propagating.", GetErrorMessage(r)); + SysTryReturn(NID_GRP, pVisualElementSurface != null, EGL_NO_SURFACE, E_INVALID_STATE, "[E_INVALID_STATE] Getting VisualElementSurface failed."); std::auto_ptr bitmap(new (std::nothrow) Bitmap); - SysTryReturn(NID_GRP, bitmap.get() != null, EGL_NO_SURFACE, E_OUT_OF_MEMORY, "Memory allocation failed."); + SysTryReturn(NID_GRP, bitmap.get() != null, EGL_NO_SURFACE, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); r = bitmap.get()->Construct(Rectangle(0, 0, width, height)); - SysTryReturn(NID_GRP, r == E_SUCCESS, EGL_NO_SURFACE, r, "Propagating."); + SysTryReturn(NID_GRP, r == E_SUCCESS, EGL_NO_SURFACE, r, "[%s] Propagating.", GetErrorMessage(r)); sglIndex = (_SglIndex)_SglCreatePixmapSurface(dpy, config, (EGLNativePixmapType)bitmap.get(), null); - SysTryReturn(NID_GRP, sglIndex > INVALID_SGL_INDEX, EGL_NO_SURFACE, E_OPERATION_FAILED, "Propagating."); + SysTryReturn(NID_GRP, sglIndex > INVALID_SGL_INDEX, EGL_NO_SURFACE, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Invalid sglIndex."); _SglInfo* pSglInfo = pSglInfoTableManipulatorInstance->LockSglInfoTable(sglIndex); pSglInfo->sglIndex = sglIndex; @@ -1280,7 +1286,7 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi if (__isDoublePixmapEnabled) { pObject = evas_object_image_filled_add(pEvas); - SysTryReturn(NID_GRP, pObject != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "Invalid object."); + SysTryReturn(NID_GRP, pObject != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Invalid object."); evas_object_image_alpha_set(pObject, EINA_TRUE); evas_object_image_size_set(pObject, widthPhysical, heightPhysical); @@ -1289,19 +1295,21 @@ _SglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType wi pVisualElementSurface = _VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN( *pWindow->GetDisplayContext(), (Handle)pObject, Dimension(width, height)); - SysTryReturn(NID_GRP, pSglInfo->pVisualElementSurface != null, EGL_NO_SURFACE, E_OPERATION_FAILED, "Propagating."); + r = GetLastResult(); + SysTryReturn(NID_GRP, r == E_SUCCESS, EGL_NO_SURFACE, r, "[%s] Propagating.", GetErrorMessage(r)); + SysTryReturn(NID_GRP, pVisualElementSurface != null, EGL_NO_SURFACE, E_INVALID_STATE, "[E_INVALID_STATE] Getting VisualElementSurface failed."); delete pSglInfo->pBitmap; pSglInfo->pBitmap = null; std::auto_ptr bitmapSecond(new (std::nothrow) Bitmap); - SysTryReturn(NID_GRP, bitmapSecond.get() != null, EGL_NO_SURFACE, E_OUT_OF_MEMORY, "Memory allocation failed."); + SysTryReturn(NID_GRP, bitmapSecond.get() != null, EGL_NO_SURFACE, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); r = bitmapSecond.get()->Construct(Rectangle(0, 0, width, height)); - SysTryReturn(NID_GRP, r == E_SUCCESS, EGL_NO_SURFACE, r, "Propagating."); + SysTryReturn(NID_GRP, r == E_SUCCESS, EGL_NO_SURFACE, r, "[%s] Propagating.", GetErrorMessage(r)); sglIndex = (_SglIndex)_SglCreatePixmapSurface(dpy, config, (EGLNativePixmapType)bitmapSecond.get(), null); - SysTryReturn(NID_GRP, sglIndex > INVALID_SGL_INDEX, EGL_NO_SURFACE, E_OPERATION_FAILED, "Propagating."); + SysTryReturn(NID_GRP, sglIndex > INVALID_SGL_INDEX, EGL_NO_SURFACE, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Invalid sglIndex."); _SglInfo* pSglInfoSecond = pSglInfoTableManipulatorInstance->LockSglInfoTable(sglIndex); pSglInfoSecond->sglIndex = sglIndex; diff --git a/src/graphics/opengl/FGrp_VideoTexture.cpp b/src/graphics/opengl/FGrp_VideoTexture.cpp index 01848ec..243cdbe 100644 --- a/src/graphics/opengl/FGrp_VideoTexture.cpp +++ b/src/graphics/opengl/FGrp_VideoTexture.cpp @@ -384,14 +384,14 @@ _VideoTexture::AddVideoTextureUpdateListener(IVideoTextureUpdateListener& listen { __pVideoTexture = pVideoTexture; result r = __pVideoTextureUpdateListener->Add(const_cast (&listener)); - SysTryLog(NID_GRP, r != E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r)); + SysTryLog(NID_GRP, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r)); } void _VideoTexture::RemoveVideoTextureUpdateListener(IVideoTextureUpdateListener& listener) { result r = __pVideoTextureUpdateListener->Remove(const_cast (&listener)); - SysTryLog(NID_GRP, r != E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r)); + SysTryLog(NID_GRP, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r)); } int -- 2.7.4