[dali_1.9.12] Merge branch 'devel/master'

Change-Id: I16b065866b6e1b46e59a14e97dc05edda6c0b3d9

diff --git a/dali/internal/update/common/discard-queue.cpp b/dali/internal/update/common/discard-queue.cpp
index 3a0f5b6..855f7b1 100644 (file)
--- a/dali/internal/update/common/discard-queue.cpp
+++ b/dali/internal/update/common/discard-queue.cpp
@@ -26,6 +26,7 @@
 #include <dali/internal/render/renderers/render-renderer.h>
 #include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/update/render-tasks/scene-graph-camera.h>
+#include <dali/internal/update/common/scene-graph-scene.h>
 
 namespace Dali
 {
@@ -41,7 +42,8 @@ DiscardQueue::DiscardQueue( RenderQueue& renderQueue )
   mNodeQueue(),
   mShaderQueue(),
   mRendererQueue(),
-  mCameraQueue()
+  mCameraQueue(),
+  mSceneQueue()
 {
 }
 
@@ -88,6 +90,13 @@ void DiscardQueue::Add( BufferIndex updateBufferIndex, Camera* camera )
   mCameraQueue[ updateBufferIndex ].PushBack( camera );
 }
 
+void DiscardQueue::Add( BufferIndex updateBufferIndex, Scene* scene )
+{
+  DALI_ASSERT_DEBUG( NULL != scene );
+
+  mSceneQueue[ updateBufferIndex ].PushBack( scene );
+}
+
 void DiscardQueue::Clear( BufferIndex updateBufferIndex )
 {
   // Destroy some discarded objects; these should no longer own any GL resources
@@ -95,6 +104,7 @@ void DiscardQueue::Clear( BufferIndex updateBufferIndex )
   mShaderQueue[ updateBufferIndex ].Clear();
   mRendererQueue[ updateBufferIndex ].Clear();
   mCameraQueue[ updateBufferIndex ].Clear();
+  mSceneQueue[ updateBufferIndex ].Clear();
 }
 
 } // namespace SceneGraph

diff --git a/dali/internal/update/common/discard-queue.h b/dali/internal/update/common/discard-queue.h
index 157b2d6..b331bc5 100644 (file)
--- a/dali/internal/update/common/discard-queue.h
+++ b/dali/internal/update/common/discard-queue.h
@@ -38,6 +38,7 @@ namespace SceneGraph
 class RenderQueue;
 class Shader;
 class Camera;
+class Scene;
 
 
 /**
@@ -54,6 +55,7 @@ public:
   typedef OwnerContainer< Shader* > ShaderQueue;
   typedef OwnerContainer< Renderer* > RendererQueue;
   typedef OwnerContainer< Camera* > CameraQueue;
+  typedef OwnerContainer< Scene* > SceneQueue;
 
   /**
    * Create a new DiscardQueue.
@@ -101,6 +103,14 @@ public:
   void Add( BufferIndex updateBufferIndex, Camera* camera );
 
   /**
+   * Adds an unwanted Scene to the discard queue.
+   * A message will be sent to clean up GL resources in the next Render.
+   * @param[in] updateBufferIndex The current update buffer index.
+   * @param[in] scene The discarded scene; DiscardQueue takes ownership.
+   */
+  void Add( BufferIndex updateBufferIndex, Scene* scene );
+
+  /**
    * Release the nodes which were queued in the frame N-2.
    * @pre This method should be called (once) at the beginning of every Update.
    * @param[in] updateBufferIndex The current update buffer index.
@@ -124,6 +134,7 @@ private:
   ShaderQueue                  mShaderQueue[2];
   RendererQueue                mRendererQueue[2];
   CameraQueue                  mCameraQueue[2];
+  SceneQueue                   mSceneQueue[2];
 };
 
 } // namespace SceneGraph

diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index dc81e10..f22e52f 100644 (file)
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -544,7 +544,7 @@ void UpdateManager::RemoveScene( Scene* scene )
   {
     if ( sceneInfo && sceneInfo->scene && sceneInfo->scene.Get() == scene )
     {
-      sceneInfo->scene.Reset();
+      mImpl->discardQueue.Add( mSceneGraphBuffers.GetUpdateBufferIndex(), sceneInfo->scene.Release() ); // take the address of the reference to a pointer
       break;
     }
   }

diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp
index 61476ca..0ac6f17 100644 (file)
--- a/dali/public-api/dali-core-version.cpp
+++ b/dali/public-api/dali-core-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const uint32_t CORE_MAJOR_VERSION = 1;
 const uint32_t CORE_MINOR_VERSION = 9;
-const uint32_t CORE_MICRO_VERSION = 11;
+const uint32_t CORE_MICRO_VERSION = 12;
 const char * const CORE_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 1111036..204de4c 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali2
 Summary:    DALi 3D Engine
-Version:    1.9.11
+Version:    1.9.12
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT