Playwright wasm tests

.config/nextest.toml

@@ -6,6 +6,12 @@ slow-timeout = { period = "45s", terminate-after = 2 }
 fail-fast = false
 retries = 0
 
+[profile.wasm]
+default-filter = "test([wasm])"
+slow-timeout = { period = "45s", terminate-after = 2 }
+fail-fast = false
+retries = 0
+
 [profile.default-miri]
 # Miri is very very slow, so give it a much longer timeout.
 slow-timeout = { period = "120s", terminate-after = 4 }

.github/workflows/ci.yml

@@ -564,16 +564,31 @@ jobs:
           rustup override set ${{ env.REPO_MSRV }}
           cargo -V
 
-      - name: Install `wasm-pack`
+      - name: Get `wasm-bindgen` version
+        run: |
+          WASM_BINDGEN_VERSION=$(cargo metadata --format-version 1 --all-features | jq '.packages[] | select(.name == "wasm-bindgen") | .version' | tr -d '"')
+
+          echo $WASM_BINDGEN_VERSION
+
+          echo "WASM_BINDGEN_VERSION=$WASM_BINDGEN_VERSION" >> "$GITHUB_ENV"
+
+      - name: Install `wasm-bindgen`
+        run: cargo +stable install wasm-bindgen-cli --version=$WASM_BINDGEN_VERSION
+
+      - name: Install `cargo-nextest`
         uses: taiki-e/install-action@v2
         with:
-          tool: wasm-pack
+          tool: cargo-nextest
 
-      - name: Execute tests
+      - name: Install playwright and npm dependencies
         run: |
-          cd wgpu
+          cd tests/wasm/runner
+          npm install
+          npx playwright install chromium --with-deps
 
-          wasm-pack test --headless --chrome --no-default-features --features wgsl,webgl,web --workspace
+      - name: Execute tests
+        run: |
+          cargo xtask test-wasm --headless
 
   gpu-test:
     # runtime is normally 5-15 minutes

.gitignore

@@ -41,9 +41,14 @@ wgpu/red.png
 
 # Cached GPU config
 .gpuconfig
+.wasmgpuconfig
 
 # Temporary clone location for wasm-bindgen mirroring
 wgpu/src/backend/webgpu/webgpu_sys/wasm_bindgen_clone_tmp
 
 # LLM-related
 .claude/settings.local.json
+
+# Wasm test generated files
+/tests/wasm/dist
+/tests/wasm/runner/node_modules

Cargo.toml

@@ -143,7 +143,7 @@ libfuzzer-sys = ">0.4.0,<=0.4.7"
 libloading = "0.8"
 libm = { version = "0.2.6", default-features = false }
 libtest-mimic = "0.8"
-log = "0.4.21"
+log = "0.4.25"
 macro_rules_attribute = "0.2"
 nanoserde = "0.2"
 nanorand = { version = "0.8", default-features = false, features = ["wyrand"] }
@@ -195,6 +195,7 @@ toml = "1.0.0"
 trybuild = "1"
 tracy-client = "0.18"
 thiserror = { version = "2.0.12", default-features = false }
+ureq = "3.2.0"
 unicode-ident = "1.0.5"
 walkdir = "2.3"
 winit = { version = "0.29", features = ["android-native-activity"] }
@@ -322,7 +323,3 @@ generator = { git = "https://github.com/Xudong-Huang/generator-rs", rev = "70b89
 [profile.release]
 lto = "thin"
 debug = true
-
-# Speed up image comparison even in debug builds
-[profile.dev.package."nv-flip-sys"]
-opt-level = 3

examples/features/Cargo.toml

@@ -27,8 +27,8 @@ test = false
 
 [features]
 default = []
-webgl = ["wgpu/webgl"]
-webgpu = ["wgpu/webgpu"]
+webgl = ["wgpu/webgl", "wgpu-test/webgl"]
+webgpu = ["wgpu/webgpu", "wgpu-test/webgl"]
 
 [dependencies]
 bytemuck.workspace = true

tests/Cargo.toml

@@ -87,6 +87,7 @@ trybuild.workspace = true
 cargo_metadata.workspace = true
 env_logger.workspace = true
 parking_lot = { workspace = true, features = ["deadlock_detection"] }
+ureq.workspace = true
 
 [target.'cfg(not(any(target_arch = "wasm32", miri)))'.dependencies]
 nv-flip.workspace = true
@@ -95,7 +96,9 @@ nv-flip.workspace = true
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_log.workspace = true
 wasm-bindgen.workspace = true
+wasm-bindgen-futures.workspace = true
 web-sys = { workspace = true }
+parking_lot = { workspace = true, features = ["deadlock_detection"] }
 
 # Webassembly Dev Dependencies
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]

tests/src/lib.rs

@@ -12,6 +12,8 @@ mod params;
 mod poll;
 mod report;
 mod run;
+pub mod wasm;
+pub mod wasm_manager;
 
 #[cfg(target_arch = "wasm32")]
 pub use init::initialize_html_canvas;
@@ -120,7 +122,11 @@ pub fn did_oom<T>(device: &wgpu::Device, callback: impl FnOnce() -> T) -> (bool,
 macro_rules! gpu_test_main {
     ($tests: expr) => {
         #[cfg(target_arch = "wasm32")]
-        wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+        #[wasm_bindgen::prelude::wasm_bindgen]
+        pub fn run_test(test_name: String) {
+            $crate::wasm::main($tests, test_name);
+        }
+
         #[cfg(target_arch = "wasm32")]
         fn main() {
             // Ensure that value is used so that warnings don't happen.
@@ -129,7 +135,11 @@ macro_rules! gpu_test_main {
 
         #[cfg(not(target_arch = "wasm32"))]
         fn main() -> $crate::native::MainResult {
-            $crate::native::main($tests)
+            if std::env::var("TEST_WASM") == Ok("true".to_string()) {
+                $crate::wasm_manager::run_wasm_browser_tests($tests)
+            } else {
+                $crate::native::main($tests)
+            }
         }
     };
 }

tests/src/report.rs

@@ -1,14 +1,14 @@
 use std::collections::HashMap;
 
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use wgpu::{
     AdapterInfo, DownlevelCapabilities, Features, Limits, TextureFormat, TextureFormatFeatures,
 };
 
 /// Report specifying the capabilities of the GPUs on the system.
 ///
 /// Must be synchronized with the definition on wgpu-info/src/report.rs.
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub(crate) struct GpuReport {
     #[cfg_attr(target_arch = "wasm32", allow(unused))]
     pub devices: Vec<AdapterReport>,
@@ -39,7 +39,7 @@ impl GpuReport {
 /// A single report of the capabilities of an Adapter.
 ///
 /// Must be synchronized with the definition on wgpu-info/src/report.rs.
-#[derive(Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct AdapterReport {
     pub info: AdapterInfo,
     pub features: Features,