ThorVG: update to v0.11.0 release.

See https://github.com/thorvg/thorvg/releases/tag/v0.11.0 + Infrastructure Repository folder structure was make it more intuitive and coherent. "thorvg/src/lib" -> "thorvg/src/common" (providing essential common functionalities used internally among the renderer and sub-modules) "thorvg/src/lib" -> "thorvg/src/renderer" (for vector drawing features) + SVG related Fix stroke regression thorvg/thorvg#1670 Support stroke dash offset function thorvg/thorvg#1591 (comment) Support Focal property in Radial Gradient thorvg/thorvg#1558
godotengine · Sep 29, 2023 · aab650f · aab650f
1 parent 1989061
commit aab650f
Show file tree

Hide file tree

Showing 71 changed files with 629 additions and 467 deletions.
diff --git a/modules/svg/SCsub b/modules/svg/SCsub
@@ -11,39 +11,45 @@ thirdparty_obj = []
 
 thirdparty_dir = "#thirdparty/thorvg/"
 thirdparty_sources = [
-    "src/lib/sw_engine/tvgSwFill.cpp",
-    "src/lib/sw_engine/tvgSwImage.cpp",
-    "src/lib/sw_engine/tvgSwMath.cpp",
-    "src/lib/sw_engine/tvgSwMemPool.cpp",
-    "src/lib/sw_engine/tvgSwRaster.cpp",
-    "src/lib/sw_engine/tvgSwRenderer.cpp",
-    "src/lib/sw_engine/tvgSwRle.cpp",
-    "src/lib/sw_engine/tvgSwShape.cpp",
-    "src/lib/sw_engine/tvgSwStroke.cpp",
-    "src/lib/tvgAccessor.cpp",
-    "src/lib/tvgCanvas.cpp",
-    "src/lib/tvgFill.cpp",
-    "src/lib/tvgGlCanvas.cpp",
-    "src/lib/tvgInitializer.cpp",
-    "src/lib/tvgLoader.cpp",
-    "src/lib/tvgPaint.cpp",
-    "src/lib/tvgPicture.cpp",
-    "src/lib/tvgRender.cpp",
-    "src/lib/tvgSaver.cpp",
-    "src/lib/tvgScene.cpp",
-    "src/lib/tvgShape.cpp",
-    "src/lib/tvgSwCanvas.cpp",
-    "src/lib/tvgTaskScheduler.cpp",
-    "src/utils/tvgBezier.cpp",
-    "src/utils/tvgCompressor.cpp",
-    "src/utils/tvgStr.cpp",
-    "src/loaders/raw/tvgRawLoader.cpp",
+    # common
+    "src/common/tvgBezier.cpp",
+    "src/common/tvgCompressor.cpp",
+    "src/common/tvgMath.cpp",
+    "src/common/tvgStr.cpp",
+    # SVG parser
     "src/loaders/svg/tvgSvgCssStyle.cpp",
     "src/loaders/svg/tvgSvgLoader.cpp",
     "src/loaders/svg/tvgSvgPath.cpp",
     "src/loaders/svg/tvgSvgSceneBuilder.cpp",
     "src/loaders/svg/tvgSvgUtil.cpp",
     "src/loaders/svg/tvgXmlParser.cpp",
+    "src/loaders/raw/tvgRawLoader.cpp",
+    # renderer common
+    "src/renderer/tvgAccessor.cpp",
+    # "src/renderer/tvgAnimation.cpp",
+    "src/renderer/tvgCanvas.cpp",
+    "src/renderer/tvgFill.cpp",
+    # "src/renderer/tvgGlCanvas.cpp",
+    "src/renderer/tvgInitializer.cpp",
+    "src/renderer/tvgLoader.cpp",
+    "src/renderer/tvgPaint.cpp",
+    "src/renderer/tvgPicture.cpp",
+    "src/renderer/tvgRender.cpp",
+    # "src/renderer/tvgSaver.cpp",
+    "src/renderer/tvgScene.cpp",
+    "src/renderer/tvgShape.cpp",
+    "src/renderer/tvgSwCanvas.cpp",
+    "src/renderer/tvgTaskScheduler.cpp",
+    # renderer sw_engine
+    "src/renderer/sw_engine/tvgSwFill.cpp",
+    "src/renderer/sw_engine/tvgSwImage.cpp",
+    "src/renderer/sw_engine/tvgSwMath.cpp",
+    "src/renderer/sw_engine/tvgSwMemPool.cpp",
+    "src/renderer/sw_engine/tvgSwRaster.cpp",
+    "src/renderer/sw_engine/tvgSwRenderer.cpp",
+    "src/renderer/sw_engine/tvgSwRle.cpp",
+    "src/renderer/sw_engine/tvgSwShape.cpp",
+    "src/renderer/sw_engine/tvgSwStroke.cpp",
 ]
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
@@ -57,16 +63,13 @@ env_thirdparty = env_svg.Clone()
 env_thirdparty.disable_warnings()
 env_thirdparty.Prepend(
     CPPPATH=[
-        thirdparty_dir + "src/lib",
-        thirdparty_dir + "src/lib/sw_engine",
-        thirdparty_dir + "src/loaders/raw",
+        thirdparty_dir + "src/common",
         thirdparty_dir + "src/loaders/svg",
-        thirdparty_dir + "src/utils",
+        thirdparty_dir + "src/renderer",
+        thirdparty_dir + "src/renderer/sw_engine",
+        thirdparty_dir + "src/loaders/raw",
     ]
 )
-# Also requires libpng headers
-if env["builtin_libpng"]:
-    env_thirdparty.Prepend(CPPPATH=["#thirdparty/libpng"])
 
 env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 env.modules_sources += thirdparty_obj

diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub
@@ -40,7 +40,11 @@ msdfgen_enabled = "msdfgen" in env.module_list
 
 if "svg" in env.module_list:
     env_text_server_adv.Prepend(
-        CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib", "#thirdparty/thorvg/src/utils"]
+        CPPPATH=[
+            "#thirdparty/thorvg/inc",
+            "#thirdparty/thorvg/src/common",
+            "#thirdparty/thorvg/src/renderer",
+        ]
     )
     # Enable ThorVG static object linking.
     env_text_server_adv.Append(CPPDEFINES=["TVG_STATIC"])

diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct
@@ -42,51 +42,56 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
 
     thirdparty_tvg_dir = "../../../thirdparty/thorvg/"
     thirdparty_tvg_sources = [
-        "src/lib/sw_engine/tvgSwFill.cpp",
-        "src/lib/sw_engine/tvgSwImage.cpp",
-        "src/lib/sw_engine/tvgSwMath.cpp",
-        "src/lib/sw_engine/tvgSwMemPool.cpp",
-        "src/lib/sw_engine/tvgSwRaster.cpp",
-        "src/lib/sw_engine/tvgSwRenderer.cpp",
-        "src/lib/sw_engine/tvgSwRle.cpp",
-        "src/lib/sw_engine/tvgSwShape.cpp",
-        "src/lib/sw_engine/tvgSwStroke.cpp",
-        "src/lib/tvgAccessor.cpp",
-        "src/lib/tvgCanvas.cpp",
-        "src/lib/tvgFill.cpp",
-        "src/lib/tvgGlCanvas.cpp",
-        "src/lib/tvgInitializer.cpp",
-        "src/lib/tvgLoader.cpp",
-        "src/lib/tvgPaint.cpp",
-        "src/lib/tvgPicture.cpp",
-        "src/lib/tvgRender.cpp",
-        "src/lib/tvgSaver.cpp",
-        "src/lib/tvgScene.cpp",
-        "src/lib/tvgShape.cpp",
-        "src/lib/tvgSwCanvas.cpp",
-        "src/lib/tvgTaskScheduler.cpp",
-        "src/utils/tvgBezier.cpp",
-        "src/utils/tvgCompressor.cpp",
-        "src/utils/tvgStr.cpp",
-        "src/loaders/raw/tvgRawLoader.cpp",
+        # common
+        "src/common/tvgBezier.cpp",
+        "src/common/tvgCompressor.cpp",
+        "src/common/tvgMath.cpp",
+        "src/common/tvgStr.cpp",
+        # SVG parser
         "src/loaders/svg/tvgSvgCssStyle.cpp",
         "src/loaders/svg/tvgSvgLoader.cpp",
         "src/loaders/svg/tvgSvgPath.cpp",
         "src/loaders/svg/tvgSvgSceneBuilder.cpp",
         "src/loaders/svg/tvgSvgUtil.cpp",
         "src/loaders/svg/tvgXmlParser.cpp",
+        "src/loaders/raw/tvgRawLoader.cpp",
+        # renderer common
+        "src/renderer/tvgAccessor.cpp",
+        # "src/renderer/tvgAnimation.cpp",
+        "src/renderer/tvgCanvas.cpp",
+        "src/renderer/tvgFill.cpp",
+        # "src/renderer/tvgGlCanvas.cpp",
+        "src/renderer/tvgInitializer.cpp",
+        "src/renderer/tvgLoader.cpp",
+        "src/renderer/tvgPaint.cpp",
+        "src/renderer/tvgPicture.cpp",
+        "src/renderer/tvgRender.cpp",
+        # "src/renderer/tvgSaver.cpp",
+        "src/renderer/tvgScene.cpp",
+        "src/renderer/tvgShape.cpp",
+        "src/renderer/tvgSwCanvas.cpp",
+        "src/renderer/tvgTaskScheduler.cpp",
+        # renderer sw_engine
+        "src/renderer/sw_engine/tvgSwFill.cpp",
+        "src/renderer/sw_engine/tvgSwImage.cpp",
+        "src/renderer/sw_engine/tvgSwMath.cpp",
+        "src/renderer/sw_engine/tvgSwMemPool.cpp",
+        "src/renderer/sw_engine/tvgSwRaster.cpp",
+        "src/renderer/sw_engine/tvgSwRenderer.cpp",
+        "src/renderer/sw_engine/tvgSwRle.cpp",
+        "src/renderer/sw_engine/tvgSwShape.cpp",
+        "src/renderer/sw_engine/tvgSwStroke.cpp",
     ]
     thirdparty_tvg_sources = [thirdparty_tvg_dir + file for file in thirdparty_tvg_sources]
 
     env_tvg.Append(
         CPPPATH=[
             "../../../thirdparty/thorvg/inc",
-            "../../../thirdparty/thorvg/src/lib",
-            "../../../thirdparty/thorvg/src/lib/sw_engine",
-            "../../../thirdparty/thorvg/src/loaders/raw",
+            "../../../thirdparty/thorvg/src/common",
             "../../../thirdparty/thorvg/src/loaders/svg",
-            "../../../thirdparty/thorvg/src/utils",
-            "../../../thirdparty/libpng",
+            "../../../thirdparty/thorvg/src/loaders/raw",
+            "../../../thirdparty/thorvg/src/renderer",
+            "../../../thirdparty/thorvg/src/renderer/sw_engine",
         ]
     )
 
@@ -96,8 +101,8 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
     env.Append(
         CPPPATH=[
             "../../../thirdparty/thorvg/inc",
-            "../../../thirdparty/thorvg/src/lib",
-            "../../../thirdparty/thorvg/src/utils",
+            "../../../thirdparty/thorvg/src/common",
+            "../../../thirdparty/thorvg/src/renderer",
         ]
     )
     env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"])

diff --git a/modules/text_server_fb/SCsub b/modules/text_server_fb/SCsub
@@ -10,7 +10,7 @@ env_text_server_fb = env_modules.Clone()
 
 if "svg" in env.module_list:
     env_text_server_fb.Prepend(
-        CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib", "#thirdparty/thorvg/src/utils"]
+        CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/common", "#thirdparty/thorvg/src/renderer"]
     )
     # Enable ThorVG static object linking.
     env_text_server_fb.Append(CPPDEFINES=["TVG_STATIC"])

diff --git a/modules/text_server_fb/gdextension_build/SConstruct b/modules/text_server_fb/gdextension_build/SConstruct
@@ -37,51 +37,56 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
 
     thirdparty_tvg_dir = "../../../thirdparty/thorvg/"
     thirdparty_tvg_sources = [
-        "src/lib/sw_engine/tvgSwFill.cpp",
-        "src/lib/sw_engine/tvgSwImage.cpp",
-        "src/lib/sw_engine/tvgSwMath.cpp",
-        "src/lib/sw_engine/tvgSwMemPool.cpp",
-        "src/lib/sw_engine/tvgSwRaster.cpp",
-        "src/lib/sw_engine/tvgSwRenderer.cpp",
-        "src/lib/sw_engine/tvgSwRle.cpp",
-        "src/lib/sw_engine/tvgSwShape.cpp",
-        "src/lib/sw_engine/tvgSwStroke.cpp",
-        "src/lib/tvgAccessor.cpp",
-        "src/lib/tvgCanvas.cpp",
-        "src/lib/tvgFill.cpp",
-        "src/lib/tvgGlCanvas.cpp",
-        "src/lib/tvgInitializer.cpp",
-        "src/lib/tvgLoader.cpp",
-        "src/lib/tvgPaint.cpp",
-        "src/lib/tvgPicture.cpp",
-        "src/lib/tvgRender.cpp",
-        "src/lib/tvgSaver.cpp",
-        "src/lib/tvgScene.cpp",
-        "src/lib/tvgShape.cpp",
-        "src/lib/tvgSwCanvas.cpp",
-        "src/lib/tvgTaskScheduler.cpp",
-        "src/utils/tvgBezier.cpp",
-        "src/utils/tvgCompressor.cpp",
-        "src/utils/tvgStr.cpp",
-        "src/loaders/raw/tvgRawLoader.cpp",
+        # common
+        "src/common/tvgBezier.cpp",
+        "src/common/tvgCompressor.cpp",
+        "src/common/tvgMath.cpp",
+        "src/common/tvgStr.cpp",
+        # SVG parser
         "src/loaders/svg/tvgSvgCssStyle.cpp",
         "src/loaders/svg/tvgSvgLoader.cpp",
         "src/loaders/svg/tvgSvgPath.cpp",
         "src/loaders/svg/tvgSvgSceneBuilder.cpp",
         "src/loaders/svg/tvgSvgUtil.cpp",
         "src/loaders/svg/tvgXmlParser.cpp",
+        "src/loaders/raw/tvgRawLoader.cpp",
+        # renderer common
+        "src/renderer/tvgAccessor.cpp",
+        # "src/renderer/tvgAnimation.cpp",
+        "src/renderer/tvgCanvas.cpp",
+        "src/renderer/tvgFill.cpp",
+        # "src/renderer/tvgGlCanvas.cpp",
+        "src/renderer/tvgInitializer.cpp",
+        "src/renderer/tvgLoader.cpp",
+        "src/renderer/tvgPaint.cpp",
+        "src/renderer/tvgPicture.cpp",
+        "src/renderer/tvgRender.cpp",
+        # "src/renderer/tvgSaver.cpp",
+        "src/renderer/tvgScene.cpp",
+        "src/renderer/tvgShape.cpp",
+        "src/renderer/tvgSwCanvas.cpp",
+        "src/renderer/tvgTaskScheduler.cpp",
+        # renderer sw_engine
+        "src/renderer/sw_engine/tvgSwFill.cpp",
+        "src/renderer/sw_engine/tvgSwImage.cpp",
+        "src/renderer/sw_engine/tvgSwMath.cpp",
+        "src/renderer/sw_engine/tvgSwMemPool.cpp",
+        "src/renderer/sw_engine/tvgSwRaster.cpp",
+        "src/renderer/sw_engine/tvgSwRenderer.cpp",
+        "src/renderer/sw_engine/tvgSwRle.cpp",
+        "src/renderer/sw_engine/tvgSwShape.cpp",
+        "src/renderer/sw_engine/tvgSwStroke.cpp",
     ]
     thirdparty_tvg_sources = [thirdparty_tvg_dir + file for file in thirdparty_tvg_sources]
 
     env_tvg.Append(
         CPPPATH=[
             "../../../thirdparty/thorvg/inc",
-            "../../../thirdparty/thorvg/src/lib",
-            "../../../thirdparty/thorvg/src/lib/sw_engine",
-            "../../../thirdparty/thorvg/src/loaders/raw",
+            "../../../thirdparty/thorvg/src/common",
             "../../../thirdparty/thorvg/src/loaders/svg",
-            "../../../thirdparty/thorvg/src/utils",
-            "../../../thirdparty/libpng",
+            "../../../thirdparty/thorvg/src/loaders/raw",
+            "../../../thirdparty/thorvg/src/renderer",
+            "../../../thirdparty/thorvg/src/renderer/sw_engine",
         ]
     )
 
@@ -91,8 +96,8 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
     env.Append(
         CPPPATH=[
             "../../../thirdparty/thorvg/inc",
-            "../../../thirdparty/thorvg/src/lib",
-            "../../../thirdparty/thorvg/src/utils",
+            "../../../thirdparty/thorvg/src/common",
+            "../../../thirdparty/thorvg/src/renderer",
         ]
     )
     env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"])

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -784,7 +784,7 @@ instead of `miniz.h` as an external dependency.
 ## thorvg
 
 - Upstream: https://github.com/thorvg/thorvg
-- Version: 0.10.7 (026ff4ce7eda10dd0cf80eeaef56fe3a5ed89f93, 2023)
+- Version: 0.11.0 (12260198d12719ea20939b68492accfc155d9ff5, 2023)
 - License: MIT
 
 Files extracted from upstream source:

diff --git a/thirdparty/thorvg/AUTHORS b/thirdparty/thorvg/AUTHORS
@@ -21,3 +21,5 @@ EunSik Jeong <[email protected]>
 Samsung Electronics Co., Ltd
 Rafał Mikrut <[email protected]>
 Martin Capitanio <[email protected]>
+RuiwenTang <[email protected]>
+YouJin Lee <[email protected]>
diff --git a/thirdparty/thorvg/inc/config.h b/thirdparty/thorvg/inc/config.h
@@ -2,8 +2,10 @@
 #define THORVG_CONFIG_H
 
 #define THORVG_SW_RASTER_SUPPORT
-
 #define THORVG_SVG_LOADER_SUPPORT
 
-#define THORVG_VERSION_STRING "0.10.7"
+// For internal debugging:
+//#define THORVG_LOG_ENABLED
+
+#define THORVG_VERSION_STRING "0.11.0"
 #endif