From 5cec69871a731a78ee91029039eb56ecbbf4db11 Mon Sep 17 00:00:00 2001
From: aardgoose <angus.sawyer@email.com>
Date: Fri, 22 Dec 2023 21:51:09 +0000
Subject: [PATCH] allow tests to run

---
 examples/webgpu_cubemap_dynamic.html         | 6 ++++--
 examples/webgpu_loader_gltf.html             | 6 ++++--
 examples/webgpu_loader_gltf_iridescence.html | 6 ++++--
 examples/webgpu_loader_gltf_sheen.html       | 6 ++++--
 test/e2e/puppeteer.js                        | 4 ----
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/examples/webgpu_cubemap_dynamic.html b/examples/webgpu_cubemap_dynamic.html
index a454d477a40758..8099ef3dde12fd 100644
--- a/examples/webgpu_cubemap_dynamic.html
+++ b/examples/webgpu_cubemap_dynamic.html
@@ -31,6 +31,8 @@
 			import * as Nodes from 'three/nodes';
 
 			import WebGPU from 'three/addons/capabilities/WebGPU.js';
+			import WebGL from 'three/addons/capabilities/WebGL.js';
+
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
 
 			import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
@@ -50,11 +52,11 @@
 
 			function init() {
 
-				if ( WebGPU.isAvailable() === false ) {
+				if ( WebGPU.isAvailable() === false && WebGL.isWebGL2Available() === false ) {
 
 					document.body.appendChild( WebGPU.getErrorMessage() );
 
-					throw new Error( 'No WebGPU support' );
+					throw new Error( 'No WebGPU or WebGL2 support' );
 
 				}
 
diff --git a/examples/webgpu_loader_gltf.html b/examples/webgpu_loader_gltf.html
index 4adbff3ab95ac6..c171984dd3446b 100644
--- a/examples/webgpu_loader_gltf.html
+++ b/examples/webgpu_loader_gltf.html
@@ -29,6 +29,8 @@
 			import * as THREE from 'three';
 
 			import WebGPU from 'three/addons/capabilities/WebGPU.js';
+			import WebGL from 'three/addons/capabilities/WebGL.js';
+
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
 
 			import { RGBELoader } from 'three/addons/loaders/RGBELoader.js';
@@ -43,11 +45,11 @@
 
 			function init() {
 
-				if ( WebGPU.isAvailable() === false ) {
+				if ( WebGPU.isAvailable() === false && WebGL.isWebGL2Available() === false ) {
 
 					document.body.appendChild( WebGPU.getErrorMessage() );
 
-					throw new Error( 'No WebGPU support' );
+					throw new Error( 'No WebGPU or WebGL2 support' );
 
 				}
 
diff --git a/examples/webgpu_loader_gltf_iridescence.html b/examples/webgpu_loader_gltf_iridescence.html
index 53d12e4ea538ee..f73ad6054195ee 100644
--- a/examples/webgpu_loader_gltf_iridescence.html
+++ b/examples/webgpu_loader_gltf_iridescence.html
@@ -28,6 +28,8 @@
 			import * as THREE from 'three';
 
 			import WebGPU from 'three/addons/capabilities/WebGPU.js';
+			import WebGL from 'three/addons/capabilities/WebGL.js';
+
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
 
 			import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
@@ -44,11 +46,11 @@
 
 			async function init() {
 
-				if ( WebGPU.isAvailable() === false ) {
+				if ( WebGPU.isAvailable() === false && WebGL.isWebGL2Available() === false ) {
 
 					document.body.appendChild( WebGPU.getErrorMessage() );
 
-					throw new Error( 'No WebGPU support' );
+					throw new Error( 'No WebGPU or WebGL2 support' );
 
 				}
 
diff --git a/examples/webgpu_loader_gltf_sheen.html b/examples/webgpu_loader_gltf_sheen.html
index fcafbff7c99c62..3f6158ee28ad79 100644
--- a/examples/webgpu_loader_gltf_sheen.html
+++ b/examples/webgpu_loader_gltf_sheen.html
@@ -32,6 +32,8 @@
 			import * as THREE from 'three';
 
 			import WebGPU from 'three/addons/capabilities/WebGPU.js';
+			import WebGL from 'three/addons/capabilities/WebGL.js';
+
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
 
 			import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
@@ -46,11 +48,11 @@
 
 			function init() {
 
-				if ( WebGPU.isAvailable() === false ) {
+				if ( WebGPU.isAvailable() === false && WebGL.isWebGL2Available() === false ) {
 
 					document.body.appendChild( WebGPU.getErrorMessage() );
 
-					throw new Error( 'No WebGPU support' );
+					throw new Error( 'No WebGPU or WebGL2 support' );
 
 				}
 
diff --git a/test/e2e/puppeteer.js b/test/e2e/puppeteer.js
index 85a718ed3bd27e..c58b332eb16cd4 100644
--- a/test/e2e/puppeteer.js
+++ b/test/e2e/puppeteer.js
@@ -117,11 +117,7 @@ const exceptionList = [
 	'webgpu_compute_points',
 	'webgpu_compute_texture',
 	'webgpu_compute_texture_pingpong',
-	'webgpu_cubemap_dynamic',
-	'webgpu_loader_gltf',
 	'webgpu_loader_gltf_compressed',
-	'webgpu_loader_gltf_iridescence',
-	'webgpu_loader_gltf_sheen',
 	'webgpu_materials',
 	'webgpu_portal',
 	'webgpu_sandbox',