From ec792d2e9a81cb73c9bc04df29a719d7d6e9e240 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 21 Jun 2024 11:31:21 +0900 Subject: [PATCH] infra: promote the GL engine to an official one. The ThorVG OpenGL/ES engine has been stabilized and improved significantly. Now, as a graphics engine, its drawing features are quite functional. It is time to officially release the engine and maintain it in the release process. Thanks @Ruiwen for going above and beyond! issue: https://github.com/thorvg/thorvg/issues/2435 --- meson.build | 22 +++++++++++++++------- meson_options.txt | 2 +- src/renderer/meson.build | 6 +++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index f59fbc8a..a5e575e2 100644 --- a/meson.build +++ b/meson.build @@ -19,15 +19,23 @@ if get_option('threads') == true endif #Engines -if get_option('engines').contains('sw') == true +all_engines = get_option('engines').contains('all') + +sw_engine = false +if all_engines or get_option('engines').contains('sw') + sw_engine = true config_h.set10('THORVG_SW_RASTER_SUPPORT', true) endif -if get_option('engines').contains('gl_beta') == true +gl_engine = false +if all_engines or get_option('engines').contains('gl') + gl_engine = true config_h.set10('THORVG_GL_RASTER_SUPPORT', true) endif -if get_option('engines').contains('wg_beta') == true +wg_engine = false +if get_option('engines').contains('wg_beta') + wg_engine = true config_h.set10('THORVG_WG_RASTER_SUPPORT', true) endif @@ -157,7 +165,7 @@ Summary: Multi-Tasking: @3@ SIMD Instruction: @4@ Raster Engine (SW): @5@ - Raster Engine (GL_BETA): @6@ + Raster Engine (GL): @6@ Raster Engine (WG_BETA): @7@ Loader (TVG): @8@ Loader (SVG): @9@ @@ -184,9 +192,9 @@ Summary: get_option('prefix'), get_option('threads'), simd_type, - get_option('engines').contains('sw'), - get_option('engines').contains('gl_beta'), - get_option('engines').contains('wg_beta'), + sw_engine, + gl_engine, + wg_engine, tvg_loader, svg_loader, ttf_loader, diff --git a/meson_options.txt b/meson_options.txt index 8f12b5eb..84bde242 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,6 @@ option('engines', type: 'array', - choices: ['sw', 'gl_beta', 'wg_beta'], + choices: ['sw', 'gl', 'wg_beta', 'all'], value: ['sw'], description: 'Enable Rasterizer Engine in thorvg') diff --git a/src/renderer/meson.build b/src/renderer/meson.build index f9f0d64a..b00888a1 100644 --- a/src/renderer/meson.build +++ b/src/renderer/meson.build @@ -1,14 +1,14 @@ engine_dep = [] -if get_option('engines').contains('sw') == true +if sw_engine subdir('sw_engine') endif -if get_option('engines').contains('gl_beta') == true +if gl_engine subdir('gl_engine') endif -if get_option('engines').contains('wg_beta') == true +if wg_engine subdir('wg_engine') endif