Merge branch 'main' into normal_map_branch

webgpu · Oct 27, 2023 · cafd907 · cafd907
2 parents 8d98133 + 7349a25
commit cafd907
Show file tree

Hide file tree

Showing 33 changed files with 36 additions and 36 deletions.
diff --git a/public/img/brickwall_diffuse.png b/public/img/brickwall_diffuse.png
diff --git a/public/img/brickwall_height.png b/public/img/brickwall_height.png
diff --git a/public/img/brickwall_normal.png b/public/img/brickwall_normal.png
diff --git a/public/img/spiral_height.png b/public/img/spiral_height.png
diff --git a/public/img/spiral_normal.png b/public/img/spiral_normal.png
diff --git a/public/img/toybox_height.png b/public/img/toybox_height.png
diff --git a/public/img/toybox_normal.png b/public/img/toybox_normal.png
diff --git a/public/img/wood_diffuse.png b/public/img/wood_diffuse.png
diff --git a/src/sample/a-buffer/main.ts b/src/sample/a-buffer/main.ts
@@ -332,7 +332,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   };
 
   const configure = () => {
-    let devicePixelRatio = window.devicePixelRatio || 1;
+    let devicePixelRatio = window.devicePixelRatio;
 
     // The default maximum storage buffer binding size is 128Mib. The amount
     // of memory we need to store transparent fragments depends on the size

diff --git a/src/sample/animometer/main.ts b/src/sample/animometer/main.ts
@@ -33,7 +33,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
 
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
@@ -283,7 +283,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
     const renderPassDescriptor = {
       colorAttachments: [
         {
-          view: undefined as any, // Assigned later
+          view: undefined as GPUTextureView, // Assigned later
           clearValue: { r: 0.0, g: 0.0, b: 0.0, a: 1.0 },
           loadOp: 'clear' as const,
           storeOp: 'store' as const,

diff --git a/src/sample/bitonicSort/utils.ts b/src/sample/bitonicSort/utils.ts
@@ -38,11 +38,11 @@ export const createBindGroupDescriptor = (
 ): BindGroupsObjectsAndLayout => {
   const layoutEntries: GPUBindGroupLayoutEntry[] = [];
   for (let i = 0; i < bindings.length; i++) {
-    const layoutEntry: any = {};
-    layoutEntry.binding = bindings[i];
-    layoutEntry.visibility = visibilities[i % visibilities.length];
-    layoutEntry[resourceTypes[i]] = resourceLayouts[i];
-    layoutEntries.push(layoutEntry);
+    layoutEntries.push({
+      binding: bindings[i],
+      visibility: visibilities[i % visibilities.length],
+      [resourceTypes[i]]: resourceLayouts[i],
+    });
   }
 
   const bindGroupLayout = device.createBindGroupLayout({
@@ -58,10 +58,10 @@ export const createBindGroupDescriptor = (
   for (let i = 0; i < resources.length; i++) {
     const groupEntries: GPUBindGroupEntry[] = [];
     for (let j = 0; j < resources[0].length; j++) {
-      const groupEntry: any = {};
-      groupEntry.binding = j;
-      groupEntry.resource = resources[i][j];
-      groupEntries.push(groupEntry);
+      groupEntries.push({
+        binding: j,
+        resource: resources[i][j],
+      });
     }
     const newBindGroup = device.createBindGroup({
       label: `${label}.bindGroup${i}`,
@@ -112,7 +112,7 @@ export const SampleInitFactoryWebGPU = async (
     const device = await adapter.requestDevice();
     if (!pageState.active) return;
     const context = canvas.getContext('webgpu') as GPUCanvasContext;
-    const devicePixelRatio = window.devicePixelRatio || 1;
+    const devicePixelRatio = window.devicePixelRatio;
     canvas.width = canvas.clientWidth * devicePixelRatio;
     canvas.height = canvas.clientHeight * devicePixelRatio;
     const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/cameras/main.ts b/src/sample/cameras/main.ts
@@ -44,7 +44,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   const device = await adapter.requestDevice();
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/computeBoids/main.ts b/src/sample/computeBoids/main.ts
@@ -10,7 +10,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
 
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
@@ -89,7 +89,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   const renderPassDescriptor = {
     colorAttachments: [
       {
-        view: undefined as any, // Assigned later
+        view: undefined as GPUTextureView, // Assigned later
         clearValue: { r: 0.0, g: 0.0, b: 0.0, a: 1.0 },
         loadOp: 'clear' as const,
         storeOp: 'store' as const,

diff --git a/src/sample/cornell/main.ts b/src/sample/cornell/main.ts
@@ -39,7 +39,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   gui.add(params, 'renderer', ['rasterizer', 'raytracer']);
   gui.add(params, 'rotateCamera', true);
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
 

diff --git a/src/sample/cubemap/main.ts b/src/sample/cubemap/main.ts
@@ -19,7 +19,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/deferredRendering/main.ts b/src/sample/deferredRendering/main.ts
@@ -20,7 +20,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const aspect = canvas.width / canvas.height;

diff --git a/src/sample/fractalCube/main.ts b/src/sample/fractalCube/main.ts
@@ -19,7 +19,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/gameOfLife/main.ts b/src/sample/gameOfLife/main.ts
@@ -8,7 +8,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   const device = await adapter.requestDevice();
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/helloTriangle/main.ts b/src/sample/helloTriangle/main.ts
@@ -10,7 +10,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/helloTriangleMSAA/main.ts b/src/sample/helloTriangleMSAA/main.ts
@@ -10,7 +10,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/imageBlur/main.ts b/src/sample/imageBlur/main.ts
@@ -14,7 +14,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/instancedCube/main.ts b/src/sample/instancedCube/main.ts
@@ -19,7 +19,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/particles/main.ts b/src/sample/particles/main.ts
@@ -22,7 +22,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/renderBundles/main.ts b/src/sample/renderBundles/main.ts
@@ -30,7 +30,7 @@ const init: SampleInit = async ({ canvas, pageState, gui, stats }) => {
 
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/resizeCanvas/main.ts b/src/sample/resizeCanvas/main.ts
@@ -15,7 +15,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
 
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
 

diff --git a/src/sample/reversedZ/main.ts b/src/sample/reversedZ/main.ts
@@ -72,7 +72,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
 
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/rotatingCube/main.ts b/src/sample/rotatingCube/main.ts
@@ -19,7 +19,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/shadowMapping/main.ts b/src/sample/shadowMapping/main.ts
@@ -17,7 +17,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
 
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const aspect = canvas.width / canvas.height;

diff --git a/src/sample/texturedCube/main.ts b/src/sample/texturedCube/main.ts
@@ -19,7 +19,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/twoCubes/main.ts b/src/sample/twoCubes/main.ts
@@ -19,7 +19,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
   if (!pageState.active) return;
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
 
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/videoUploading/main.ts b/src/sample/videoUploading/main.ts
@@ -21,7 +21,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   if (!pageState.active) return;
 
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/videoUploadingWebCodecs/main.ts b/src/sample/videoUploadingWebCodecs/main.ts
@@ -21,7 +21,7 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
   if (!pageState.active) return;
 
   const context = canvas.getContext('webgpu') as GPUCanvasContext;
-  const devicePixelRatio = window.devicePixelRatio || 1;
+  const devicePixelRatio = window.devicePixelRatio;
   canvas.width = canvas.clientWidth * devicePixelRatio;
   canvas.height = canvas.clientHeight * devicePixelRatio;
   const presentationFormat = navigator.gpu.getPreferredCanvasFormat();

diff --git a/src/sample/worker/main.ts b/src/sample/worker/main.ts
@@ -32,7 +32,7 @@ const init: SampleInit = async ({ canvas, pageState }) => {
     // Anything drawn to the OffscreenCanvas that call returns will automatically be displayed on
     // the source canvas on the page.
     const offscreenCanvas = canvas.transferControlToOffscreen();
-    const devicePixelRatio = window.devicePixelRatio || 1;
+    const devicePixelRatio = window.devicePixelRatio;
     offscreenCanvas.width = canvas.clientWidth * devicePixelRatio;
     offscreenCanvas.height = canvas.clientHeight * devicePixelRatio;