From 92eaa1383a202e8651ed010862003f2f653d48c8 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 11:34:34 -0400 Subject: [PATCH 01/12] Run WebGPU tests on self-hosted runner --- .github/workflows/ci-test.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 04dcd79306..af9e3d6696 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -14,12 +14,12 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - platform: ubuntu-latest + browser: chrome + - platform: self-hosted browser: chrome - # - os: windows-latest - # browser: chrome - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v4 @@ -30,12 +30,12 @@ jobs: node-version: 20.x - name: Verify Chrome (Ubuntu) - if: matrix.os == 'ubuntu-latest' && matrix.browser == 'chrome' + if: matrix.platform == 'ubuntu-latest' && matrix.browser == 'chrome' run: | google-chrome --version - name: Verify Chrome (Windows) - if: matrix.os == 'windows-latest' && matrix.browser == 'chrome' + if: matrix.platform == 'windows-latest' && matrix.browser == 'chrome' run: | & "C:\Program Files\Google\Chrome\Application\chrome.exe" --version @@ -44,14 +44,14 @@ jobs: env: CI: true - #- name: Build and test (Ubuntu) - # if: matrix.os == 'windows-latest' - # run: npm test -- --project=unit-tests-webgpu - # env: - # CI: true + - name: Build and test WebGPU (Ubuntu) + if: matrix.platform == 'self-hosted' + run: npm test -- --project=unit-tests-webgpu + env: + CI: true - name: Build and test (Ubuntu) - if: matrix.os == 'ubuntu-latest' + if: matrix.platform == 'ubuntu-latest' run: npm test -- --project=unit-tests env: CI: true From cb3302a3ba6125cd576fa80f3b2ddb1cfa3c9ad8 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 11:40:11 -0400 Subject: [PATCH 02/12] Add some logging --- src/webgpu/p5.RendererWebGPU.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webgpu/p5.RendererWebGPU.js b/src/webgpu/p5.RendererWebGPU.js index 2bcf39949d..4bd5c89d91 100644 --- a/src/webgpu/p5.RendererWebGPU.js +++ b/src/webgpu/p5.RendererWebGPU.js @@ -50,8 +50,8 @@ class RendererWebGPU extends Renderer3D { async _initContext() { this.adapter = await navigator.gpu?.requestAdapter(this._webgpuAttributes); - // console.log('Adapter:'); - // console.log(this.adapter); + console.log('Adapter:'); + console.log(this.adapter); if (this.adapter) { console.log([...this.adapter.features]); } @@ -59,8 +59,8 @@ class RendererWebGPU extends Renderer3D { // Todo: check support requiredFeatures: ['depth32float-stencil8'] }); - // console.log('Device:'); - // console.log(this.device); + console.log('Device:'); + console.log(this.device); if (!this.device) { throw new Error('Your browser does not support WebGPU.'); } From d3a86958e5d90e68afbd7d279f86bbe59c6e105a Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 11:54:50 -0400 Subject: [PATCH 03/12] Try with less flags --- vitest.workspace.mjs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/vitest.workspace.mjs b/vitest.workspace.mjs index a8da776a67..1d4d131eff 100644 --- a/vitest.workspace.mjs +++ b/vitest.workspace.mjs @@ -47,11 +47,6 @@ export default defineWorkspace([ args: [ '--no-sandbox', '--headless=new', - '--enable-unsafe-webgpu', - '--use-vulkan=swiftshader', - '--use-webgpu-adapter=swiftshader', - '--use-angle=vulkan', - '--no-sandbox', ] } } : undefined @@ -97,10 +92,6 @@ export default defineWorkspace([ '--no-sandbox', '--headless=new', '--enable-unsafe-webgpu', - '--use-vulkan=swiftshader', - '--use-webgpu-adapter=swiftshader', - '--use-angle=vulkan', - '--no-sandbox', ] } } : undefined From 17105b0304c2cec488e44a3a0e5822fe27b5301a Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 12:38:53 -0400 Subject: [PATCH 04/12] More flags to enable hardware acceleration --- vitest.workspace.mjs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vitest.workspace.mjs b/vitest.workspace.mjs index 1d4d131eff..d62306c01f 100644 --- a/vitest.workspace.mjs +++ b/vitest.workspace.mjs @@ -92,6 +92,11 @@ export default defineWorkspace([ '--no-sandbox', '--headless=new', '--enable-unsafe-webgpu', + '--use-gl=angle', + '--use-angle=gl-egl', + '--use-cmd-decoder=passthrough', + '--disable-frame-rate-limit', + '--disable-dev-shm-usage', ] } } : undefined From da286a8e69007629eb40f2af6b5d9aa42d4b0de5 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 13:04:51 -0400 Subject: [PATCH 05/12] try without --headless=new --- vitest.workspace.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/vitest.workspace.mjs b/vitest.workspace.mjs index d62306c01f..f062a9dce6 100644 --- a/vitest.workspace.mjs +++ b/vitest.workspace.mjs @@ -90,7 +90,6 @@ export default defineWorkspace([ 'goog:chromeOptions': { args: [ '--no-sandbox', - '--headless=new', '--enable-unsafe-webgpu', '--use-gl=angle', '--use-angle=gl-egl', From fbacfaeff22818aa90d46ba70afdadb6100e2a87 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 13:09:51 -0400 Subject: [PATCH 06/12] Try with xvfb --- .github/workflows/ci-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index af9e3d6696..16792b5da4 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -46,7 +46,10 @@ jobs: - name: Build and test WebGPU (Ubuntu) if: matrix.platform == 'self-hosted' - run: npm test -- --project=unit-tests-webgpu + run: | + Xvfb :99 -screen 0 1280x720x24 & + export DISPLAY=:99 + npm test -- --project=unit-tests-webgpu env: CI: true From c4aea11ce0117f9d290c66d0e4040e9da2d15010 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 13:34:27 -0400 Subject: [PATCH 07/12] Try without options to see if it works locally --- .github/workflows/ci-test.yml | 9 +++------ vitest.workspace.mjs | 12 +++++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 16792b5da4..774c6f43da 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -44,14 +44,11 @@ jobs: env: CI: true - - name: Build and test WebGPU (Ubuntu) + - name: Build and test WebGPU (self-hosted) if: matrix.platform == 'self-hosted' - run: | - Xvfb :99 -screen 0 1280x720x24 & - export DISPLAY=:99 - npm test -- --project=unit-tests-webgpu + run: npm test -- --project=unit-tests-webgpu env: - CI: true + CI: "" - name: Build and test (Ubuntu) if: matrix.platform == 'ubuntu-latest' diff --git a/vitest.workspace.mjs b/vitest.workspace.mjs index f062a9dce6..212da6b706 100644 --- a/vitest.workspace.mjs +++ b/vitest.workspace.mjs @@ -85,17 +85,19 @@ export default defineWorkspace([ name: 'chrome', provider: 'webdriverio', screenshotFailures: false, + headless: false, providerOptions: { capabilities: process.env.CI ? { 'goog:chromeOptions': { args: [ '--no-sandbox', '--enable-unsafe-webgpu', - '--use-gl=angle', - '--use-angle=gl-egl', - '--use-cmd-decoder=passthrough', - '--disable-frame-rate-limit', - '--disable-dev-shm-usage', + '--headless=new', + // '--use-gl=angle', + // '--use-angle=gl-egl', + // '--use-cmd-decoder=passthrough', + // '--disable-frame-rate-limit', + // '--disable-dev-shm-usage', ] } } : undefined From 7097c7897c0d4c19b58423ca0ca18bf352fa4f67 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 14 Sep 2025 15:48:53 -0400 Subject: [PATCH 08/12] Update to work on ubuntu instead of my mac --- .github/workflows/ci-test.yml | 6 ++++-- vitest.workspace.mjs | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 774c6f43da..1e2ba7e1e7 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -46,9 +46,11 @@ jobs: - name: Build and test WebGPU (self-hosted) if: matrix.platform == 'self-hosted' - run: npm test -- --project=unit-tests-webgpu + # run: npm test -- --project=unit-tests-webgpu + run: | + xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" bash -c 'CI=true npm run test -- --project=unit-tests-webgpu' env: - CI: "" + CI: true - name: Build and test (Ubuntu) if: matrix.platform == 'ubuntu-latest' diff --git a/vitest.workspace.mjs b/vitest.workspace.mjs index 212da6b706..5069a79cdc 100644 --- a/vitest.workspace.mjs +++ b/vitest.workspace.mjs @@ -91,11 +91,12 @@ export default defineWorkspace([ 'goog:chromeOptions': { args: [ '--no-sandbox', + '--headless=new', '--enable-unsafe-webgpu', '--headless=new', - // '--use-gl=angle', - // '--use-angle=gl-egl', - // '--use-cmd-decoder=passthrough', + '--use-gl=angle', + '--use-angle=gl-egl', + '--use-cmd-decoder=passthrough', // '--disable-frame-rate-limit', // '--disable-dev-shm-usage', ] From 1d9fd5a639c41f81bf6aecadf6f80096c61eb5df Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Tue, 23 Sep 2025 08:12:35 -0400 Subject: [PATCH 09/12] Remove logging --- src/webgpu/p5.RendererWebGPU.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/webgpu/p5.RendererWebGPU.js b/src/webgpu/p5.RendererWebGPU.js index 4bd5c89d91..2072b8f538 100644 --- a/src/webgpu/p5.RendererWebGPU.js +++ b/src/webgpu/p5.RendererWebGPU.js @@ -50,8 +50,6 @@ class RendererWebGPU extends Renderer3D { async _initContext() { this.adapter = await navigator.gpu?.requestAdapter(this._webgpuAttributes); - console.log('Adapter:'); - console.log(this.adapter); if (this.adapter) { console.log([...this.adapter.features]); } @@ -59,8 +57,6 @@ class RendererWebGPU extends Renderer3D { // Todo: check support requiredFeatures: ['depth32float-stencil8'] }); - console.log('Device:'); - console.log(this.device); if (!this.device) { throw new Error('Your browser does not support WebGPU.'); } From 0d9db7fa16193981bd9ea532230371d6aa4a89f5 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 15 Nov 2026 10:56:30 -0500 Subject: [PATCH 10/12] Don't use WebGL fallback in test suite --- src/core/main.js | 12 ++++++++++++ src/core/rendering.js | 6 ++++++ test/unit/visual/cases/webgpu.js | 1 + test/unit/webgpu/p5.Framebuffer.js | 1 + test/unit/webgpu/p5.RendererWebGPU.js | 1 + test/unit/webgpu/p5.Shader.js | 1 + 6 files changed, 22 insertions(+) diff --git a/src/core/main.js b/src/core/main.js index f21471ff6a..c22a8a2d77 100644 --- a/src/core/main.js +++ b/src/core/main.js @@ -914,6 +914,18 @@ export default p5; * } */ +/** + * Makes `createCanvas(w, h, WEBGPU)` throw an error instead of falling back + * to WebGL when WebGPU isn't available. The default is `false`. + * + * ```js + * p5.disableWebGLFallback = true; + * ``` + * + * @static + * @property {Boolean} disableWebGLFallback + */ + /** * Loads a p5.js library. * diff --git a/src/core/rendering.js b/src/core/rendering.js index 98ae36bf95..321519356f 100644 --- a/src/core/rendering.js +++ b/src/core/rendering.js @@ -137,6 +137,9 @@ function rendering(p5, fn) { if (!renderers[renderer] && typeof renderer === 'string') { if (renderer === constants.WEBGPU) { + if (p5.disableWebGLFallback) { + throw new Error('To create a WEBGPU canvas, add the WebGPU add-on to your project.'); + } p5.FES.log`To create a WEBGPU canvas, add the WebGPU add-on to your project.`(); if (renderers[constants.WEBGL]) { p5.FES.log`Falling back to WebGL renderer.`(); @@ -176,6 +179,9 @@ function rendering(p5, fn) { if (selectedRenderer !== constants.WEBGPU) { throw new Error('Failed to create canvas.'); } + if (p5.disableWebGLFallback) { + throw e; + } p5.FES.log`${e.message} Falling back to WebGL renderer.`(); return this.createCanvas(w, h, constants.WEBGL, ...args); }); diff --git a/test/unit/visual/cases/webgpu.js b/test/unit/visual/cases/webgpu.js index 9dd4c9a3e8..9475be0fac 100644 --- a/test/unit/visual/cases/webgpu.js +++ b/test/unit/visual/cases/webgpu.js @@ -3,6 +3,7 @@ import { visualSuite, visualTest } from '../visualTest'; import rendererWebGPU from '../../../../src/webgpu/p5.RendererWebGPU'; p5.registerAddon(rendererWebGPU); +p5.disableWebGLFallback = true; visualSuite('WebGPU', function () { visualSuite('Shaders', function () { diff --git a/test/unit/webgpu/p5.Framebuffer.js b/test/unit/webgpu/p5.Framebuffer.js index e395849051..5961c5e742 100644 --- a/test/unit/webgpu/p5.Framebuffer.js +++ b/test/unit/webgpu/p5.Framebuffer.js @@ -2,6 +2,7 @@ import p5 from '../../../src/app.js'; import rendererWebGPU from '../../../src/webgpu/p5.RendererWebGPU'; p5.registerAddon(rendererWebGPU); +p5.disableWebGLFallback = true; suite('WebGPU p5.Framebuffer', function () { let myp5; diff --git a/test/unit/webgpu/p5.RendererWebGPU.js b/test/unit/webgpu/p5.RendererWebGPU.js index e7a0f025e6..7aa7b6c315 100644 --- a/test/unit/webgpu/p5.RendererWebGPU.js +++ b/test/unit/webgpu/p5.RendererWebGPU.js @@ -3,6 +3,7 @@ import rendererWebGPU from '../../../src/webgpu/p5.RendererWebGPU'; import { vi } from 'vitest'; p5.registerAddon(rendererWebGPU); +p5.disableWebGLFallback = true; suite('WebGPU p5.RendererWebGPU', function () { let myp5; diff --git a/test/unit/webgpu/p5.Shader.js b/test/unit/webgpu/p5.Shader.js index 041ae652dc..7f40d533a0 100644 --- a/test/unit/webgpu/p5.Shader.js +++ b/test/unit/webgpu/p5.Shader.js @@ -2,6 +2,7 @@ import p5 from '../../../src/app.js'; import rendererWebGPU from '../../../src/webgpu/p5.RendererWebGPU'; p5.registerAddon(rendererWebGPU); +p5.disableWebGLFallback = true; suite('WebGPU p5.Shader', function () { var myp5; From eb9d8cf254276e7f33fdaf9cde1f0c89ecb250b3 Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 15 Nov 2026 11:31:52 -0500 Subject: [PATCH 11/12] Update criterion --- .github/workflows/ci-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 57cde5330f..85de63e50f 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -89,5 +89,5 @@ jobs: env: CI: true - name: fail job if tests failed - if: steps.test.outcome == 'failure' || steps.test-webgpu.outcome == 'failure' + if: steps.test.outcome != 'success' || steps.test-webgpu.outcome != 'success' run: exit 1 \ No newline at end of file From 7306fed1789edbd1f9f45e136db4f21ab89a76ba Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Mon, 16 Nov 2026 07:07:17 -0500 Subject: [PATCH 12/12] Revert "Update criterion" This reverts commit eb9d8cf254276e7f33fdaf9cde1f0c89ecb250b3. --- .github/workflows/ci-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 85de63e50f..57cde5330f 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -89,5 +89,5 @@ jobs: env: CI: true - name: fail job if tests failed - if: steps.test.outcome != 'success' || steps.test-webgpu.outcome != 'success' + if: steps.test.outcome == 'failure' || steps.test-webgpu.outcome == 'failure' run: exit 1 \ No newline at end of file