Add a feature test for WebGPU

white-axe · white-axe · commit 858fcb0b5fe8 · 2023-10-15T20:53:50.000-04:00
diff --git a/assets/main.js b/assets/main.js
@@ -14,7 +14,34 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-import wasm_bindgen, { luminol_main_start } from '/luminol.js';
 
-await wasm_bindgen();
-luminol_main_start();
+// Check if the user's browser supports WebGPU
+console.log('Checking for WebGPU support…');
+let gpu = false;
+try {
+    let adapter = await navigator.gpu?.requestAdapter();
+    gpu = typeof GPUAdapter === 'function' && adapter instanceof GPUAdapter;
+} catch (e) {}
+if (gpu) {
+    console.log('WebGPU is supported. Using WebGPU backend if available.');
+} else {
+    console.log('No support detected. Using WebGL backend if available.');
+}
+
+// If WebGPU is supported, always use luminol.js
+// If WebGPU is not supported, use luminol_webgl.js if it's available or fallback to luminol.js
+let fallback = false;
+let luminol;
+if (gpu) {
+    luminol = await import('/luminol.js');
+} else {
+    try {
+        luminol = await import('/luminol_webgl.js');
+        fallback = true;
+    } catch (e) {
+        luminol = await import ('/luminol.js');
+    }
+}
+
+await luminol.default(fallback ? '/luminol_webgl_bg.wasm' : '/luminol_bg.wasm');
+luminol.luminol_main_start(fallback);
diff --git a/assets/worker.js b/assets/worker.js
@@ -14,11 +14,12 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-import wasm_bindgen, { luminol_worker_start } from '/luminol.js';
 
 onmessage = async function (e) {
-    if (e.data[0] === 'init') {
-        await wasm_bindgen(undefined, e.data[1]);
-        await luminol_worker_start(e.data[2]);
-    }
+    const [fallback, memory, canvas] = e.data;
+
+    const luminol = await import(fallback ? '/luminol_webgl.js' : '/luminol.js');
+
+    await luminol.default(fallback ? '/luminol_webgl_bg.wasm' : '/luminol_bg.wasm', memory);
+    await luminol.luminol_worker_start(canvas);
 };
diff --git a/src/main.rs b/src/main.rs
@@ -146,7 +146,7 @@ static WORKER_DATA: Lazy<AtomicRefCell<Option<WorkerData>>> =
 
 #[cfg(target_arch = "wasm32")]
 #[wasm_bindgen]
-pub fn luminol_main_start() {
+pub fn luminol_main_start(fallback: bool) {
     let (panic_tx, mut panic_rx) = mpsc::unbounded_channel::<()>();
 
     wasm_bindgen_futures::spawn_local(async move {
@@ -225,7 +225,7 @@ pub fn luminol_main_start() {
         .expect("failed to spawn web worker");
 
     let message = js_sys::Array::new();
-    message.push(&JsValue::from("init"));
+    message.push(&JsValue::from(fallback));
     message.push(&wasm_bindgen::memory());
     message.push(&offscreen_canvas);
     let transfer = js_sys::Array::new();
