From 5f4468236ccbb14bd54ec6bb09fe199f09f849a4 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@lottiefiles.com>
Date: Thu, 27 Jun 2024 14:18:53 +0900
Subject: [PATCH] sw_engine: ++thread safety

Synchronize the engine process precisely
before updating internal data.
---
 src/renderer/sw_engine/tvgSwRenderer.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/renderer/sw_engine/tvgSwRenderer.cpp b/src/renderer/sw_engine/tvgSwRenderer.cpp
index b53a9dff..0a3f5ef7 100644
--- a/src/renderer/sw_engine/tvgSwRenderer.cpp
+++ b/src/renderer/sw_engine/tvgSwRenderer.cpp
@@ -718,9 +718,6 @@ void* SwRenderer::prepareCommon(SwTask* task, const RenderTransform* transform,
     if (!surface) return task;
     if (flags == RenderUpdateFlag::None) return task;
 
-    //Finish previous task if it has duplicated request.
-    task->done();
-
     //TODO: Failed threading them. It would be better if it's possible.
     //See: https://github.com/thorvg/thorvg/issues/1409
     //Guarantee composition targets get ready.
@@ -769,8 +766,11 @@ RenderData SwRenderer::prepare(Surface* surface, const RenderMesh* mesh, RenderD
     //prepare task
     auto task = static_cast<SwImageTask*>(data);
     if (!task) task = new SwImageTask;
+    else task->done();
+
     task->source = surface;
     task->mesh = mesh;
+
     return prepareCommon(task, transform, clips, opacity, flags);
 }
 
@@ -780,6 +780,8 @@ RenderData SwRenderer::prepare(const Array<RenderData>& scene, RenderData data,
     //prepare task
     auto task = static_cast<SwSceneTask*>(data);
     if (!task) task = new SwSceneTask;
+    else task->done();
+
     task->scene = scene;
 
     //TODO: Failed threading them. It would be better if it's possible.
@@ -788,6 +790,7 @@ RenderData SwRenderer::prepare(const Array<RenderData>& scene, RenderData data,
     for (auto task = scene.begin(); task < scene.end(); ++task) {
         static_cast<SwTask*>(*task)->done();
     }
+
     return prepareCommon(task, transform, clips, opacity, flags);
 }
 
@@ -796,10 +799,10 @@ RenderData SwRenderer::prepare(const RenderShape& rshape, RenderData data, const
 {
     //prepare task
     auto task = static_cast<SwShapeTask*>(data);
-    if (!task) {
-        task = new SwShapeTask;
-        task->rshape = &rshape;
-    }
+    if (!task) task = new SwShapeTask;
+    else task->done();
+
+    task->rshape = &rshape;
     task->clipper = clipper;
 
     return prepareCommon(task, transform, clips, opacity, flags);