From 0f31cd51b83cb16c36f050fcf8836d399f34000d Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 10 Dec 2013 10:39:30 +0900 Subject: [PATCH] Remove warnings Change-Id: I44d0b4215dd819687123d7e625ead3114358068e --- src/ui/animations/FUiAnim_GlNode.cpp | 4 ++-- src/ui/animations/FUiAnim_GlRenderManager.cpp | 8 +++++--- src/ui/animations/FUiAnim_VisualElementImpl.cpp | 6 +++--- src/ui/animations/FUiAnim_VisualElementSharedData.cpp | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ui/animations/FUiAnim_GlNode.cpp b/src/ui/animations/FUiAnim_GlNode.cpp index 28e1833..b8a8a6c 100644 --- a/src/ui/animations/FUiAnim_GlNode.cpp +++ b/src/ui/animations/FUiAnim_GlNode.cpp @@ -65,8 +65,8 @@ namespace Tizen { namespace Ui { namespace Animations _GlNode::_GlNode(void) : __pSurface(null) - , __pAlphaMaskSurface(null) , __pSharedSurface(null) + , __pAlphaMaskSurface(null) , __syncNeeded(true) , __bounds() , __visibleRect() @@ -88,9 +88,9 @@ _GlNode::_GlNode(void) , __pMesh(null) , __pLight(null) , __pMaterial(null) - , __pShaderProgram(null) , __textureUpdated(true) , __alphaUpdated(true) + , __pShaderProgram(null) { memset(extraSurfaceOpacity, 1.0, sizeof(float)*EXTRA_SURFACE_MAX); memset(__pExtraSurfaceList, null, sizeof(VisualElementSurface* )*EXTRA_SURFACE_MAX); diff --git a/src/ui/animations/FUiAnim_GlRenderManager.cpp b/src/ui/animations/FUiAnim_GlRenderManager.cpp index ad1e6a7..3a0d140 100644 --- a/src/ui/animations/FUiAnim_GlRenderManager.cpp +++ b/src/ui/animations/FUiAnim_GlRenderManager.cpp @@ -96,6 +96,8 @@ _GlRenderManager::_RenderObject::_RenderObject(void) , __updateStencil(false) , __stencilIndex(0) , __isMesh(false) + , __isTexUpdated(true) + , __isAlphaMaskUpdated(true) , __mvp() , __modelview() , __invModelview() @@ -104,6 +106,7 @@ _GlRenderManager::_RenderObject::_RenderObject(void) , __colorMask(true) , __textureId(0) , __alphaMaskId(0) + , __extraSurfaceCount(0) , __pSurfaceInfo(null) , __bounds() , __pLight(null) @@ -122,15 +125,12 @@ _GlRenderManager::_RenderObject::_RenderObject(void) , __aTexCoord(-1) , __aColor(-1) , __aNormal(-1) - , __extraSurfaceCount(0) , __GPUSkinning(false) , __aWeights(-1) , __aJointIds(-1) , __pWeights(null) , __pJointIds(null) , __jointsCount(0) - , __isTexUpdated(true) - , __isAlphaMaskUpdated(true) { memset(__extraSurfaceOpacity, 1.0, sizeof(float)*EXTRA_SURFACE_MAX); @@ -1340,6 +1340,8 @@ _GlRenderManager::CompositeView(_GlLayer* pLayer, _RootVisualElement* pRoot, _Vi VisualElementSurface* pSurface = pView->GetRenderTarget(); if (pSurface) { + PRINT("_GlRenderManager::CompositeView: Use FBO\n"); + __pGlContext->BindFramebuffer(pView->GetRenderTargetInfo()); __needClear = true; } diff --git a/src/ui/animations/FUiAnim_VisualElementImpl.cpp b/src/ui/animations/FUiAnim_VisualElementImpl.cpp index 47acd5a..2fbed4e 100644 --- a/src/ui/animations/FUiAnim_VisualElementImpl.cpp +++ b/src/ui/animations/FUiAnim_VisualElementImpl.cpp @@ -1494,7 +1494,7 @@ _VisualElementImpl::SetAlphaMask(const VisualElementSurface* pAlphaMaskSurface) result _VisualElementImpl::SetExtraSurface(ExtraSurfaceIndex extraSurfaceIndex, VisualElementSurface* pExtraSurface) { - SysTryReturnResult(NID_UI_ANIM, (extraSurfaceIndex >= 0 & extraSurfaceIndex < EXTRA_SURFACE_MAX), E_INVALID_ARG, "invalit extraSurfaceIndex"); + SysTryReturnResult(NID_UI_ANIM, (extraSurfaceIndex >= 0 && extraSurfaceIndex < EXTRA_SURFACE_MAX), E_INVALID_ARG, "invalit extraSurfaceIndex"); if (unlikely(pExtraSurface == GetSharedData().pExtraSurfaceList[extraSurfaceIndex])) { @@ -1555,7 +1555,7 @@ _VisualElementImpl::SetExtraSurface(ExtraSurfaceIndex extraSurfaceIndex, VisualE result _VisualElementImpl::SetExtraSurfaceOpacity(ExtraSurfaceIndex extraSurfaceIndex, float opacity) { - SysTryReturnResult(NID_UI_ANIM, (extraSurfaceIndex >= 0 & extraSurfaceIndex < EXTRA_SURFACE_MAX), E_INVALID_ARG, "invalit extraSurfaceIndex"); + SysTryReturnResult(NID_UI_ANIM, (extraSurfaceIndex >= 0 && extraSurfaceIndex < EXTRA_SURFACE_MAX), E_INVALID_ARG, "invalit extraSurfaceIndex"); SysTryReturnResult(NID_UI_ANIM, GetSharedData().pExtraSurfaceList[extraSurfaceIndex], E_OBJ_NOT_FOUND, "EXTRA_SURFACE_%d not exist.", extraSurfaceIndex+1); if (GetSharedData().pExtraSurfaceList[extraSurfaceIndex] != null) @@ -1585,7 +1585,7 @@ _VisualElementImpl::GetAlphaMaskN(void) const VisualElementSurface* _VisualElementImpl::GetExtraSurfaceN(ExtraSurfaceIndex extraSurfaceIndex) const { - SysTryReturn(NID_UI_ANIM, (extraSurfaceIndex >= 0 & extraSurfaceIndex < EXTRA_SURFACE_MAX), null, E_INVALID_ARG, "invalit extraSurfaceIndex"); + SysTryReturn(NID_UI_ANIM, (extraSurfaceIndex >= 0 && extraSurfaceIndex < EXTRA_SURFACE_MAX), null, E_INVALID_ARG, "invalit extraSurfaceIndex"); _VisualElementImpl* pThis = const_cast< _VisualElementImpl* >(this); pThis->RebuildHierarchyProps(0, true, true); diff --git a/src/ui/animations/FUiAnim_VisualElementSharedData.cpp b/src/ui/animations/FUiAnim_VisualElementSharedData.cpp index 777966f..d8516ab 100644 --- a/src/ui/animations/FUiAnim_VisualElementSharedData.cpp +++ b/src/ui/animations/FUiAnim_VisualElementSharedData.cpp @@ -1196,6 +1196,8 @@ _VisualElementSharedData::ChangeNativeNode(_VisualElementImpl& presentation, boo } __useEfl = true; + + return E_SUCCESS; } #endif }}} // Tizen::Ui::Animations -- 2.7.4