git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-07 21:23:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

infra: removed beta tag from WebGPU

Browse source 
Removed beta tag for dev convenience. Also, ensures that
ThorVG will officially release WebGPU in the next version (v1.0)
This commit is contained in:
Hermet Park 2024-10-07 18:50:03 +09:00 • committed by Jinny You
parent 01559a45c0
commit 145195baac
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build_android.yml vendored
View file

@ -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

6
.github/workflows/build_ubuntu.yml vendored
View file

@ -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

2
examples/meson.build
View file

@ -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')

4
meson.build
View file

@ -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@

2
meson_options.txt
View file

@ -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')

4
wasm_build.sh
View file

@ -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