diff --git a/render-wasm/Cargo.lock b/render-wasm/Cargo.lock index 77fc2b7044..3efed8c0ed 100644 --- a/render-wasm/Cargo.lock +++ b/render-wasm/Cargo.lock @@ -480,9 +480,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "skia-bindings" -version = "0.81.0" +version = "0.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0974d1fad6818b1c84390a8cd26b48a4f48f1dfd2658e130fb0db5ebbb50aa1c" +checksum = "fbcd02d7008cdc4ac86b7d7461874c7ac1d2c38cad96629d7617c5d4b848acd0" dependencies = [ "bindgen", "cc", @@ -496,9 +496,9 @@ dependencies = [ [[package]] name = "skia-safe" -version = "0.81.0" +version = "0.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cade7bc92e092138e3b726ce57162b3e0f4f3099c616b32af740a13ca18cb2a" +checksum = "008dec8a6b69f03b2a0bc4520dc06a7a8efc844e59b2a9bc024f0cb02fb60b63" dependencies = [ "base64", "bitflags", diff --git a/render-wasm/Cargo.toml b/render-wasm/Cargo.toml index 55f41c1e2d..ba3a38c792 100644 --- a/render-wasm/Cargo.toml +++ b/render-wasm/Cargo.toml @@ -20,11 +20,12 @@ path = "src/main.rs" base64 = "0.22.1" gl = "0.14.0" indexmap = "2.7.1" -skia-safe = { version = "0.81.0", default-features = false, features = [ +skia-safe = { version = "0.86.0", default-features = false, features = [ "gl", "svg", "textlayout", "binary-cache", + "webp" ] } uuid = { version = "1.11.0", features = ["v4", "js"] } diff --git a/render-wasm/_build_env b/render-wasm/_build_env index 0ddd949727..bfd8142844 100644 --- a/render-wasm/_build_env +++ b/render-wasm/_build_env @@ -35,7 +35,7 @@ EMCC_CFLAGS="--no-entry \ -sMAX_WEBGL_VERSION=2 \ -sMODULARIZE=1 \ -sEXPORT_NAME=createRustSkiaModule \ - -sEXPORTED_RUNTIME_METHODS=GL,stringToUTF8 \ + -sEXPORTED_RUNTIME_METHODS=GL,stringToUTF8,HEAPU8,HEAPU32,HEAPF32 \ -sEXPORT_ES6=1" export EM_CACHE="/tmp/emsdk_cache"; diff --git a/render-wasm/build b/render-wasm/build index 85db7bcaeb..9394f0fa13 100755 --- a/render-wasm/build +++ b/render-wasm/build @@ -9,7 +9,7 @@ pushd $_SCRIPT_DIR; . ./_build_env export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"}; -export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"} +export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.86.0-1/skia-binaries-cab569e6478958ca0783-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"} cargo build $_CARGO_PARAMS diff --git a/render-wasm/lint b/render-wasm/lint index cd72c33f9d..7ebbc5e471 100755 --- a/render-wasm/lint +++ b/render-wasm/lint @@ -11,7 +11,7 @@ fi . ./_build_env export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"}; -export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"} +export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.86.0-1/skia-binaries-cab569e6478958ca0783-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"} ALLOWED_RULES="-D static_mut_refs" diff --git a/render-wasm/test b/render-wasm/test index 90009283fc..5dce6c5905 100755 --- a/render-wasm/test +++ b/render-wasm/test @@ -6,7 +6,7 @@ pushd $_SCRIPT_DIR; . ./_build_env -export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz"} +export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.86.0-1/skia-binaries-cab569e6478958ca0783-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache-webp.tar.gz"} export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"}; cargo test --bin render_wasm -- --show-output diff --git a/render-wasm/watch b/render-wasm/watch index 720e0e2e93..73de0ac7cf 100755 --- a/render-wasm/watch +++ b/render-wasm/watch @@ -7,7 +7,8 @@ pushd $_SCRIPT_DIR; . ./_build_env export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"}; -export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"} +export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.86.0-1/skia-binaries-cab569e6478958ca0783-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"} + pushd $_SCRIPT_DIR; cargo watch \