Delete sync object at DiscardResource()

Since we don't queueing Resource of sync object,
we should call delete for Discard cases.

Change-Id: I6a5a905b7cd6142c3dc59ef399374c8552d88904
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp b/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp
index 035b13bfa604a7234ecf103bd75e05d7feee74de..0c42e7eb4eb95dea252faaa1ac449f5fa6b703e4 100644 (file)
--- a/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp
+++ b/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp
@@ -88,6 +88,38 @@ struct GLESDeleter
   }
 };
 
+template<>
+struct GLESDeleter<GLES::SyncObject>
+{
+  GLESDeleter() = default;
+
+  void operator()(GLES::SyncObject* object)
+  {
+    // Destroy and delete object otherwise
+    if(DALI_LIKELY(object))
+    {
+      object->DestroyResource();
+    }
+    delete object;
+  }
+};
+
+template<>
+struct GLESDeleter<EGL::SyncObject>
+{
+  GLESDeleter() = default;
+
+  void operator()(EGL::SyncObject* object)
+  {
+    // Destroy and delete object otherwise
+    if(DALI_LIKELY(object))
+    {
+      object->DestroyResource();
+    }
+    delete object;
+  }
+};
+
 /**
  * @brief Helper function allocating graphics object
  *

diff --git a/dali/internal/graphics/gles-impl/egl-sync-object.cpp b/dali/internal/graphics/gles-impl/egl-sync-object.cpp
index bfcccd6a10db0ffbccd66fc9dec9f544cf1c8968..519a5de0b9f9d0d3d694300969da57dabf2bf70b 100644 (file)
--- a/dali/internal/graphics/gles-impl/egl-sync-object.cpp
+++ b/dali/internal/graphics/gles-impl/egl-sync-object.cpp
@@ -55,9 +55,8 @@ bool SyncObject::InitializeResource()
 
 void SyncObject::DiscardResource()
 {
-  // Called from custom deleter.
   // Don't use discard queue, drop immediately.
-  DestroyResource();
+  DALI_ASSERT_ALWAYS(false && "SyncObject don't support DiscardResource() method. Please check your code.");
 }
 
 bool SyncObject::IsSynced()

diff --git a/dali/internal/graphics/gles-impl/gles-sync-object.cpp b/dali/internal/graphics/gles-impl/gles-sync-object.cpp
index bfaccecf43cf18ea35756d89ee87c08d675c409e..3e29a791f1c44a6f3c5eda645b0d4bfceb08d5a2 100644 (file)
--- a/dali/internal/graphics/gles-impl/gles-sync-object.cpp
+++ b/dali/internal/graphics/gles-impl/gles-sync-object.cpp
@@ -60,9 +60,8 @@ bool SyncObject::InitializeResource()
 
 void SyncObject::DiscardResource()
 {
-  // Called from custom deleter.
   // Don't use discard queue, drop immediately.
-  DestroyResource();
+  DALI_ASSERT_ALWAYS(false && "SyncObject don't support DiscardResource() method. Please check your code.");
 }
 
 bool SyncObject::IsSynced()