From 5b18f1d76d483c4b73cf16390286f65f1511709d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= Date: Thu, 10 Apr 2025 12:50:22 +0200 Subject: [PATCH 1/2] :wrench: Update test script to use the right architecture --- render-wasm/_build_env | 2 +- render-wasm/test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/render-wasm/_build_env b/render-wasm/_build_env index 00ce9a8be..fe6b42b7d 100644 --- a/render-wasm/_build_env +++ b/render-wasm/_build_env @@ -39,4 +39,4 @@ fi export EMCC_CFLAGS; export _CARGO_PARAMS; -export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-2/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz" +export 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" diff --git a/render-wasm/test b/render-wasm/test index 8b1a25d9d..1a5906035 100755 --- a/render-wasm/test +++ b/render-wasm/test @@ -4,8 +4,8 @@ pushd $_SCRIPT_DIR; . ./_build_env -export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-2/skia-binaries-24dee32a277b6c7b5357-aarch64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz" -export _CARGO_PARAMS="--target=aarch64-unknown-linux-gnu"; +export 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 _CARGO_PARAMS="--target=x86_64-unknown-linux-gnu"; cargo test $_CARGO_PARAMS --bin render_wasm -- --show-output popd From 1d7ff1f9e42e3d253704a33703bf9f8f5622bb5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= Date: Thu, 10 Apr 2025 12:52:56 +0200 Subject: [PATCH 2/2] :wrench: Fix requiring an emscripten macro in non-wasm architectures --- render-wasm/src/performance.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/render-wasm/src/performance.rs b/render-wasm/src/performance.rs index 92292d9d4..b1198f662 100644 --- a/render-wasm/src/performance.rs +++ b/render-wasm/src/performance.rs @@ -1,9 +1,7 @@ -use crate::get_now; - #[allow(dead_code)] #[cfg(target_arch = "wasm32")] pub fn get_time() -> i32 { - get_now!() as i32 + crate::get_now!() as i32 } #[allow(dead_code)]