diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 9c7c036b9a..57cde5330f 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -19,6 +19,8 @@ jobs: include: - os: ubuntu-26.04 browser: chrome + - os: self-hosted + browser: chrome # - os: windows-latest # browser: chrome @@ -49,6 +51,15 @@ jobs: env: CI: true + - name: Build and test WebGPU (self-hosted) + id: test-webgpu + if: matrix.os == 'self-hosted' + run: | + xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" bash -c 'CI=true npm run test -- --project=unit-tests-webgpu' + continue-on-error: true + env: + CI: true + - name: Build and test (Ubuntu) id: test if: matrix.os == 'ubuntu-26.04' @@ -78,5 +89,5 @@ jobs: env: CI: true - name: fail job if tests failed - if: steps.test.outcome != 'success' + if: steps.test.outcome == 'failure' || steps.test-webgpu.outcome == 'failure' run: exit 1 \ No newline at end of file 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; diff --git a/vitest.config.js b/vitest.config.js index adce6ec546..d2259d5745 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -88,9 +88,9 @@ export default defineConfig({ '--no-sandbox', '--headless=new', '--enable-unsafe-webgpu', - '--use-vulkan=swiftshader', - '--use-webgpu-adapter=swiftshader', - '--use-angle=vulkan' + '--use-gl=angle', + '--use-angle=gl-egl', + '--use-cmd-decoder=passthrough' ] } : { channel: 'chromium' }