Enable WebGPU render test. NFC
diff --git a/.circleci/config.yml b/.circleci/config.yml
index df801ba..3370ad6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -348,12 +348,13 @@
EMTEST_DETECT_TEMPFILE_LEAKS: "0"
# --no-sandbox because we are running as root and chrome requires
# this flag for now: https://crbug.com/638180
- CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-gl=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile --enable-experimental-web-platform-features"
- CHROME_FLAGS_HEADLESS: "--headless=new --remote-debugging-port=1234"
+ CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-angle=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile --enable-experimental-web-platform-features"
+ CHROME_FLAGS_HEADLESS: "--headless --remote-debugging-port=1234"
CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-memory64 --experimental-wasm-stack-switching --experimental-wasm-type-reflection\""
CHROME_FLAGS_NOCACHE: "--disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --disable-application-cache --incognito"
+ CHROME_FLAGS_WEBGPU: "--enable-unsafe-webgpu --use-webgpu-adapter=swiftshader --enable-features=Vulkan"
command: |
- export EMTEST_BROWSER="/usr/bin/google-chrome $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE"
+ export EMTEST_BROWSER="/usr/bin/google-chrome $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE $CHROME_FLAGS_WEBGPU"
# There are tests in the browser test suite that using libraries
# that are not included by "./embuilder build ALL". For example the
# PIC version of libSDL which is used by test_sdl2_misc_main_module
@@ -382,8 +383,8 @@
EMTEST_DETECT_TEMPFILE_LEAKS: "0"
# --no-sandbox becasue we are running as root and chrome requires
# this flag for now: https://crbug.com/638180
- CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-gl=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile"
- CHROME_FLAGS_HEADLESS: "--headless=new --remote-debugging-port=1234"
+ CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-angle=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile"
+ CHROME_FLAGS_HEADLESS: "--headless --remote-debugging-port=1234"
CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-memory64\""
CHROME_FLAGS_NOCACHE: "--disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --disable-application-cache --incognito"
command: |
diff --git a/test/test_browser.py b/test/test_browser.py
index 814f2be..befe1a5 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -185,7 +185,7 @@
assert callable(f)
def decorated(self, *args, **kwargs):
- if is_chrome() and '--use-gl=swiftshader' in EMTEST_BROWSER:
+ if is_chrome() and 'swiftshader' in EMTEST_BROWSER:
self.skipTest('not compatible with swiftshader')
return f(self, *args, **kwargs)
diff --git a/test/webgpu_basic_rendering.cpp b/test/webgpu_basic_rendering.cpp
index 7a415ea..f2ee61c 100644
--- a/test/webgpu_basic_rendering.cpp
+++ b/test/webgpu_basic_rendering.cpp
@@ -24,19 +24,6 @@
if (message) {
printf("RequestAdapter: %s\n", message);
}
- if (status == WGPURequestAdapterStatus_Unavailable) {
- printf("WebGPU unavailable; exiting cleanly\n");
- // exit(0) (rather than emscripten_force_exit(0)) ensures there is
- // no dangling keepalive.
-#if _REENTRANT
- // FIXME: In multi-threaded builds this callback runs on the main
- // which seems to be causing the runtime to stay alive here and
- // results in the 99 being returned.
- emscripten_force_exit(0);
-#else
- exit(0);
-#endif
- }
assert(status == WGPURequestAdapterStatus_Success);
wgpu::Adapter adapter = wgpu::Adapter::Acquire(cAdapter);
