fixed Emulator bugs

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

diff --git a/src/ui/animations/FUiAnim_GlCompositor.cpp b/src/ui/animations/FUiAnim_GlCompositor.cpp
index 75f00e1..0870df2 100644 (file)
--- a/src/ui/animations/FUiAnim_GlCompositor.cpp
+++ b/src/ui/animations/FUiAnim_GlCompositor.cpp
@@ -554,6 +554,7 @@ _GlCompositor::CompositeView(_GlLayer* pLayer, _RootVisualElement* pRoot, _ViewI
        {
                _GlVisualElementSurfaceImpl* pRenderSurfaceImpl = SURF_IMPL(*pSurface);
                __pRenderManager->GetRenderQueue()->SetRenderTarget(pRenderSurfaceImpl);
+               __pRenderManager->GetRenderQueue()->SetClear();
        }
        else
        {
@@ -731,7 +732,8 @@ _GlCompositor::CompositeLayer(_GlLayer* pLayer)
                return;
        }
 
-       __needClear = true;
+//     __needClear = true;
+       __pRenderManager->GetRenderQueue()->SetClear();
 
        _AutoMutex renderLock(*_VisualElementEnvironment::GetTreeLock());
        bool isUpdated = pLayer->UpdateNativeNodes();

diff --git a/src/ui/animations/FUiAnim_GlRenderManager.cpp b/src/ui/animations/FUiAnim_GlRenderManager.cpp
index b0762cb..d5f785c 100644 (file)
--- a/src/ui/animations/FUiAnim_GlRenderManager.cpp
+++ b/src/ui/animations/FUiAnim_GlRenderManager.cpp
@@ -1447,6 +1447,7 @@ _GlRenderManager::CommandHandlerFlush(void)//(_GlLayer* pLayer)
        _GlRenderManager* pThis = this;
        _GlContext* pGlContext = pThis->__pGlContext;
 
+
        _GlRenderQueue* pRenderQueue = null;
        _GlRenderQueue::_RenderObject* pRenderObjects = null;
        int queueCount = 0;
@@ -1491,9 +1492,17 @@ _GlRenderManager::CommandHandlerFlush(void)//(_GlLayer* pLayer)
 
        if(pRenderQueue->__renderingProps & _GlRenderQueue::UPDATED_PROP_LAYER)
        {
+
                if(pRenderQueue->__pLayer)
                {
-                       pGlContext->MakeCurrent(pRenderQueue->__pLayer->GetNativeSurface());
+               // WARNING : need to check.. is it needed?
+               memset(__pGlContext->__textureId, 0, sizeof(unsigned int) * (EXTRA_SURFACE_MAX + 2));
+#ifdef VE_USE_GL_MULTI_CONTEXT
+               __pGlContext = (_GlContext*)pRenderQueue->__pLayer->GetContext();
+               __pGlContext->MakeCurrent();
+#else
+               __pGlContext->MakeCurrent(pRenderQueue->__pLayer->GetNativeSurface());
+#endif
                }
        }