✨ Updated state initialization and organized code

index.js

@@ -21,16 +21,12 @@ async function InitializeCanvas(state) {
     state.canvas.height = config.canvas.height;
 
     state.webgpu.adapter = await navigator.gpu.requestAdapter();
-    const { device, context, presentationFormat } = await initializeDevice(navigator, state.webgpu.adapter, state.canvas);
+    await initializeDevice(state);
 
-    if (!device) {
+    if (!state.webgpu.device) {
         alert('Failed to initialize WebGPU');
         return;
     }
-
-    state.webgpu.device = device;
-    state.webgpu.context = context;
-    state.webgpu.presentationFormat = presentationFormat;
 }
 
 async function InitializeResources(state) {
@@ -107,4 +103,3 @@ async function Main() {
 }
 
 Main();
-

wgpu-device.js

@@ -1,11 +1,15 @@
 // wgpu-device.js
 
-export async function initializeDevice(navigator, adapter, canvas) {
-    const context = canvas.getContext('webgpu');
-    const device = await adapter?.requestDevice();
+export async function initializeDevice(state) {
+    const context = state.canvas.getContext('webgpu');
+    const device = await state.webgpu.adapter?.requestDevice();
+    
     if (!device) {
         alert('need a browser that supports WebGPU');
-        return { device: null, context: null, presentationFormat: null };
+        state.webgpu.device = null;
+        state.webgpu.context = null;
+        state.webgpu.presentationFormat = null;
+        return;
     }
 
     const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
@@ -14,5 +18,7 @@ export async function initializeDevice(navigator, adapter, canvas) {
         format: presentationFormat,
     });
 
-    return { device, context, presentationFormat };
+    state.webgpu.device = device;
+    state.webgpu.context = context;
+    state.webgpu.presentationFormat = presentationFormat;
 }

wgpu-state.js

@@ -3,7 +3,10 @@
 export function createState(config) {
     return {
         webgpu: {
+            adapter: null,
             device: null,
+            context: null,
+            presentationFormat: null,
             pipeline: null,
             vertexBuffer: null,
             indexBuffer: null,
@@ -11,10 +14,7 @@ export function createState(config) {
             texture: null,
             sampler: null,
             bindGroup: null,
-            context: null,
-            presentationFormat: null,
             shaderCode: null,
-            adapter: null
         },
         matrices: {
             uniformValues: new Float32Array(config.floatsInUniformBuffer),
@@ -40,4 +40,3 @@ export function createState(config) {
         }
     };
 }
-