From 145195baac1e2ce282e48950fa4614bd9c7dd2f2 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 7 Oct 2024 18:50:03 +0900 Subject: [PATCH] infra: removed beta tag from WebGPU Removed beta tag for dev convenience. Also, ensures that ThorVG will officially release WebGPU in the next version (v1.0) --- .github/workflows/build_android.yml | 4 ++-- .github/workflows/build_ubuntu.yml | 6 +++--- examples/meson.build | 2 +- meson.build | 4 ++-- meson_options.txt | 2 +- wasm_build.sh | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index b30b6216..695449e2 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -34,7 +34,7 @@ jobs: API: 21 run: | sed -e "s|NDK|$NDK|g" -e "s|HOST_TAG|linux-x86_64|g" -e "s|API|$API|g" ./cross/android_x86_64.txt > /tmp/android_cross.txt - meson setup build -Dlog=true -Dengines=all -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true -Dthreads=false --cross-file /tmp/android_cross.txt + meson setup build -Dlog=true -Dengines="sw, gl" -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true -Dthreads=false --cross-file /tmp/android_cross.txt sudo ninja -C build install - uses: actions/upload-artifact@v4 @@ -64,7 +64,7 @@ jobs: API: 21 run: | sed -e "s|NDK|$NDK|g" -e "s|HOST_TAG|linux-x86_64|g" -e "s|API|$API|g" ./cross/android_aarch64.txt > /tmp/android_cross.txt - meson setup build -Dlog=true -Dengines=all -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true -Dthreads=false --cross-file /tmp/android_cross.txt + meson setup build -Dlog=true -Dengines="sw, gl" -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true -Dthreads=false --cross-file /tmp/android_cross.txt sudo ninja -C build install - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index b670c576..897fda05 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -26,7 +26,7 @@ jobs: - name: Build run: | - meson setup build -Dlog=true -Dengines=all -Dexamples=true -Dloaders=all -Dsavers=all -Dbindings=capi -Dtools=all + meson setup build -Dlog=true -Dengines="sw, gl" -Dexamples=true -Dloaders=all -Dsavers=all -Dbindings=capi -Dtools=all sudo ninja -C build install compact_test: @@ -43,7 +43,7 @@ jobs: - name: Build run: | - meson setup build -Dlog=true -Dengines=all -Dloaders=all -Dsavers=all -Dstatic=true -Dthreads=false + meson setup build -Dlog=true -Dengines="sw, gl" -Dloaders=all -Dsavers=all -Dstatic=true -Dthreads=false sudo ninja -C build install unit_test: @@ -64,7 +64,7 @@ jobs: - name: Build run: | - meson setup build -Dloaders="all" -Dengines=all -Dsavers="all" -Dbindings="capi" -Dtests=true --errorlogs + meson setup build -Dloaders="all" -Dengines="sw, gl" -Dsavers="all" -Dbindings="capi" -Dtests=true --errorlogs sudo ninja -C build install test - uses: actions/upload-artifact@v4 diff --git a/examples/meson.build b/examples/meson.build index 2f94c9af..8eaa33c0 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -8,7 +8,7 @@ endif examples_dep = [dependency('sdl2')] -if get_option('engines').contains('wg_beta') +if all_engines or get_option('engines').contains('wg') examples_dep += dependency('wgpu_native') if host_machine.system() == 'darwin' add_languages('objcpp') diff --git a/meson.build b/meson.build index 1154d1dd..4676b28a 100644 --- a/meson.build +++ b/meson.build @@ -34,7 +34,7 @@ if all_engines or get_option('engines').contains('gl') endif wg_engine = false -if get_option('engines').contains('wg_beta') +if all_engines or get_option('engines').contains('wg') wg_engine = true config_h.set10('THORVG_WG_RASTER_SUPPORT', true) endif @@ -169,7 +169,7 @@ Summary: SIMD Instruction: @4@ Raster Engine (SW): @5@ Raster Engine (GL): @6@ - Raster Engine (WG_BETA): @7@ + Raster Engine (WG): @7@ Loader (TVG): @8@ Loader (SVG): @9@ Loader (TTF): @10@ diff --git a/meson_options.txt b/meson_options.txt index 84bde242..479e4ab5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,6 @@ option('engines', type: 'array', - choices: ['sw', 'gl', 'wg_beta', 'all'], + choices: ['sw', 'gl', 'wg', 'all'], value: ['sw'], description: 'Enable Rasterizer Engine in thorvg') diff --git a/wasm_build.sh b/wasm_build.sh index cbd3b8ba..10e14f52 100755 --- a/wasm_build.sh +++ b/wasm_build.sh @@ -13,13 +13,13 @@ fi if [ ! -d "./build_wasm32_$BACKEND" ]; then if [[ "$BACKEND" == "wg" ]]; then sed "s|EMSDK:|$EMSDK|g" ./cross/wasm32_wg.txt > /tmp/.wasm_cross.txt - meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all" -Dsavers="all" -Dthreads=false -Dbindings="wasm_beta" -Dengines="wg_beta" --cross-file /tmp/.wasm_cross.txt build_wasm32_wg + meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all" -Dsavers="all" -Dthreads=false -Dbindings="wasm_beta" -Dengines="wg" --cross-file /tmp/.wasm_cross.txt build_wasm32_wg elif [[ "$BACKEND" == "sw" ]]; then sed "s|EMSDK:|$EMSDK|g" ./cross/wasm32_sw.txt > /tmp/.wasm_cross.txt meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all" -Dsavers="all" -Dthreads=false -Dbindings="wasm_beta" --cross-file /tmp/.wasm_cross.txt build_wasm32_sw else sed "s|EMSDK:|$EMSDK|g" ./cross/wasm32_wg.txt > /tmp/.wasm_cross.txt - meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all" -Dsavers="all" -Dthreads=false -Dbindings="wasm_beta" -Dengines="wg_beta, sw" --cross-file /tmp/.wasm_cross.txt build_wasm32_all + meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all" -Dsavers="all" -Dthreads=false -Dbindings="wasm_beta" -Dengines="wg, sw" --cross-file /tmp/.wasm_cross.txt build_wasm32_all fi fi