DSRenderViewDaliImpl: remove actor from offscreen at destructor

Change-Id: I967d9f5961f9f62b109f2321729114a2f3585d1f

diff --git a/src/DSRender/DSRenderViewDaliImpl.cpp b/src/DSRender/DSRenderViewDaliImpl.cpp
index 5ec25c6..b76a004 100644 (file)
--- a/src/DSRender/DSRenderViewDaliImpl.cpp
+++ b/src/DSRender/DSRenderViewDaliImpl.cpp
@@ -83,7 +83,8 @@ Geometry DSRenderViewDaliImpl::CreateTexturedQuad()
 }
 
 DSRenderViewDaliImpl::DSRenderViewDaliImpl(std::shared_ptr<DSWindow> window, Dali::OffscreenWindow offscreenWindow)
-       : __window(window)
+       : __window(window),
+         __offscreenWindow(offscreenWindow)
 {
        std::string fragmentShader = "#extension GL_OES_EGL_image_external:require\n";
        fragmentShader += FRAGMENT_SHADER;
@@ -108,6 +109,8 @@ DSRenderViewDaliImpl::DSRenderViewDaliImpl(std::shared_ptr<DSWindow> window, Dal
 
 DSRenderViewDaliImpl::~DSRenderViewDaliImpl()
 {
+       __textureViewActor.RemoveRenderer(__renderer);
+       __offscreenWindow.Remove(__textureViewActor);
 }
 
 bool DSRenderViewDaliImpl::setBuffer(std::shared_ptr<IDSBuffer> buffer)

diff --git a/src/DSRender/DSRenderViewDaliImpl.h b/src/DSRender/DSRenderViewDaliImpl.h
index 1bb7698..47c72ff 100644 (file)
--- a/src/DSRender/DSRenderViewDaliImpl.h
+++ b/src/DSRender/DSRenderViewDaliImpl.h
@@ -49,6 +49,7 @@ private:
        void __onWindowBufferChanged(std::shared_ptr<IDSBuffer> buffer);
 
        std::shared_ptr<DSWindow> __window;
+       Dali::OffscreenWindow     __offscreenWindow;
        Dali::Renderer            __renderer;
        Dali::Actor               __textureViewActor;
 };