chore(webgpu): Partial WGSL texture/sampler support

visgl · Aug 31, 2024 · fcc9095 · fcc9095
1 parent c836c09
commit fcc9095
Show file tree

Hide file tree

Showing 67 changed files with 628 additions and 331 deletions.
diff --git a/dev-modules/babel-plugin-inline-webgl-constants/package.json b/dev-modules/babel-plugin-inline-webgl-constants/package.json
@@ -24,6 +24,6 @@
     "require": "./dist/index.cjs"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.1.0-alpha.17"
+    "@luma.gl/constants": "9.1.0-alpha.19"
   }
 }
diff --git a/docs/api-guide/gpu/gpu-bindings.md b/docs/api-guide/gpu/gpu-bindings.md
@@ -143,17 +143,17 @@ WGSL vertex shader
 struct Uniforms {
   modelViewProjectionMatrix : mat4x4<f32>;
 };
-[[binding(0), group(0)]] var<uniform> uniforms : Uniforms; // BINDING 0
+@binding(0), @group(0) var<uniform> uniforms : Uniforms; // BINDING 0
 
 struct VertexOutput {
-  [[builtin(position)]] Position : vec4<f32>;
-  [[location(0)]] fragUV : vec2<f32>;
-  [[location(1)]] fragPosition: vec4<f32>;
+  @builtin(position) Position : vec4<f32>;
+  @location(0) fragUV : vec2<f32>;
+  @location(1) fragPosition: vec4<f32>;
 };
 
-[[stage(vertex)]]
-fn main([[location(0)]] position : vec4<f32>,
-        [[location(1)]] uv : vec2<f32>) -> VertexOutput {
+@stage(vertex)
+fn main(@location(0) position : vec4<f32>,
+        @location(1) uv : vec2<f32>) -> VertexOutput {
   var output : VertexOutput;
   output.Position = uniforms.modelViewProjectionMatrix * position;
   output.fragUV = uv;
@@ -165,12 +165,12 @@ fn main([[location(0)]] position : vec4<f32>,
 WGSL Fragment Shader
 
 ```rust
-[[group(0), binding(1)]] var mySampler: sampler; // BINDING 1
-[[group(0), binding(2)]] var myTexture: texture_2d<f32>; // BINDING 2
+@group(0), binding(1) var mySampler: sampler; // BINDING 1
+@group(0), binding(2) var myTexture: texture_2d<f32>; // BINDING 2
 
-[[stage(fragment)]]
-fn main([[location(0)]] fragUV: vec2<f32>,
-        [[location(1)]] fragPosition: vec4<f32>) -> [[location(0)]] vec4<f32> {
+@stage(fragment)
+fn main(@location(0) fragUV: vec2<f32>,
+        @location(1) fragPosition: vec4<f32>) -> [[location(0)]] vec4<f32> {
   return textureSample(myTexture, mySampler, fragUV) * fragPosition;
 }
  ```
diff --git a/docs/api-reference/core/bindings.md b/docs/api-reference/core/bindings.md
@@ -115,17 +115,17 @@ WGSL vertex shader
 struct Uniforms {
   modelViewProjectionMatrix : mat4x4<f32>;
 };
-[[binding(0), group(0)]] var<uniform> uniforms : Uniforms; // BINDING 0
+@binding(0), @group(0) var<uniform> uniforms : Uniforms; // BINDING 0
 
 struct VertexOutput {
-  [[builtin(position)]] Position : vec4<f32>;
-  [[location(0)]] fragUV : vec2<f32>;
-  [[location(1)]] fragPosition: vec4<f32>;
+  @builtin(position) Position : vec4<f32>;
+  @location(0) fragUV : vec2<f32>;
+  @location(1) fragPosition: vec4<f32>;
 };
 
-[[stage(vertex)]]
-fn main([[location(0)]] position : vec4<f32>,
-        [[location(1)]] uv : vec2<f32>) -> VertexOutput {
+@stage(vertex)
+fn main(@location(0) position : vec4<f32>,
+        @location(1) uv : vec2<f32>) -> VertexOutput {
   var output : VertexOutput;
   output.Position = uniforms.modelViewProjectionMatrix * position;
   output.fragUV = uv;
@@ -137,12 +137,12 @@ fn main([[location(0)]] position : vec4<f32>,
 WGSL FRAGMENT SHADER
 
 ```rust
-[[group(0), binding(1)]] var mySampler: sampler; // BINDING 1
-[[group(0), binding(2)]] var myTexture: texture_2d<f32>; // BINDING 2
+@group(0), @binding(1) var mySampler: sampler; // BINDING 1
+@group(0), @binding(2) var myTexture: texture_2d<f32>; // BINDING 2
 
-[[stage(fragment)]]
-fn main([[location(0)]] fragUV: vec2<f32>,
-        [[location(1)]] fragPosition: vec4<f32>) -> [[location(0)]] vec4<f32> {
+@stage(fragment)
+fn main(@location(0) fragUV: vec2<f32>,
+        @location(1) fragPosition: vec4<f32>) -> @location(0) vec4<f32> {
   return textureSample(myTexture, mySampler, fragUV) * fragPosition;
 }
  ```
diff --git a/docs/tutorials/README.mdx b/docs/tutorials/README.mdx
@@ -103,8 +103,8 @@ Open the file `package.json` (created when we initialized npm), and add the foll
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
   },
   "devDependencies": {
     "typescript": "^5.5.0",
@@ -129,8 +129,8 @@ The full contents of the `package.json` should be the following (dependency vers
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
   },
   "devDependencies": {
     "typescript": "^5.5.0",

diff --git a/examples/api/animation/app.ts b/examples/api/animation/app.ts
@@ -280,7 +280,6 @@ export default class AppAnimationLoopTemplate extends AnimationLoopTemplate {
         .translate(cube.translation)
         .rotateXYZ([rotationX, rotationY, rotationZ]);
 
-      cube.model.setUniforms({});
       cube.uniformStore.setUniforms({
         app: {
           uModel: modelMatrix

diff --git a/examples/api/animation/package.json b/examples/api/animation/package.json
@@ -8,10 +8,10 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/api/cubemap/package.json b/examples/api/cubemap/package.json
@@ -8,12 +8,12 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.1.0-alpha.17",
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
-    "@luma.gl/webgpu": "9.1.0-alpha.17",
+    "@luma.gl/constants": "9.1.0-alpha.19",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
+    "@luma.gl/webgpu": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/api/texture-3d/package.json b/examples/api/texture-3d/package.json
@@ -8,11 +8,11 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
-    "@luma.gl/webgpu": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
+    "@luma.gl/webgpu": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/showcase/instancing/package.json b/examples/showcase/instancing/package.json
@@ -9,11 +9,11 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
-    "@luma.gl/webgpu": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
+    "@luma.gl/webgpu": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/showcase/persistence/app.ts b/examples/showcase/persistence/app.ts
@@ -75,7 +75,7 @@ fn vertexMain(inputs: VertexInputs) -> FragmentInputs {
 }
 
 @fragment
-fn fragmentMain(inputs: FragmentInputs) -> [[location(0)]] vec4<f32> {
+fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4<f32> {
   let attenuation = 1.0;
   if (sphere.lighting) {
     light = normalize(vec3(1,1,2));

diff --git a/examples/showcase/persistence/package.json b/examples/showcase/persistence/package.json
@@ -8,11 +8,11 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
-    "@luma.gl/webgpu": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
+    "@luma.gl/webgpu": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/showcase/postprocessing/index.html b/examples/showcase/postprocessing/index.html
@@ -25,7 +25,7 @@
   import {webgpuAdapter} from '@luma.gl/webgpu';
   import {makeAnimationLoop} from '@luma.gl/engine';
   import AnimationLoopTemplate from './app.ts';
-  const animationLoop = makeAnimationLoop(AnimationLoopTemplate, {adapters: [/* webgpuAdapter, */ webgl2Adapter]});
+  const animationLoop = makeAnimationLoop(AnimationLoopTemplate, {adapters: [webgpuAdapter, webgl2Adapter]});
   animationLoop.start();
 </script>
 <body>

diff --git a/examples/showcase/postprocessing/package.json b/examples/showcase/postprocessing/package.json
@@ -10,12 +10,12 @@
   "dependencies": {
     "@loaders.gl/core": "^4.2.0",
     "@loaders.gl/gltf": "^4.2.0",
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/gltf": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
-    "@luma.gl/webgpu": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/gltf": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
+    "@luma.gl/webgpu": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/tutorials/hello-cube/app.ts b/examples/tutorials/hello-cube/app.ts
@@ -22,7 +22,9 @@ struct Uniforms {
   modelViewProjectionMatrix : mat4x4<f32>,
 };
 
-@binding(0) @group(0) var<uniform> app : Uniforms;
+@group(0) @binding(0) var<uniform> app : Uniforms;
+// @group(0) @binding(1) var uTexture : texture_2d<f32>;
+// @group(0) @binding(2) var uTextureSampler : sampler;
 
 struct VertexInputs {
   // CUBE GEOMETRY
@@ -48,6 +50,7 @@ fn vertexMain(inputs: VertexInputs) -> FragmentInputs {
 @fragment
 fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4<f32> {
   return inputs.fragPosition;
+  // return textureSample(uTexture, uTextureSampler, inputs.fragUV);
 }
 `;
 
@@ -125,9 +128,9 @@ export default class AppAnimationLoopTemplate extends AnimationLoopTemplate {
       data: loadImageBitmap('vis-logo.png'),
       mipmaps: true,
       sampler: device.createSampler({
-        minFilter: 'linear',
-        magFilter: 'linear',
-        mipmapFilter: 'linear'
+        minFilter: 'nearest',
+        magFilter: 'nearest',
+        mipmapFilter: 'nearest'
       })
     });
 

diff --git a/examples/tutorials/hello-cube/package.json b/examples/tutorials/hello-cube/package.json
@@ -8,10 +8,10 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/tutorials/hello-cube/vite.config.ts b/examples/tutorials/hello-cube/vite.config.ts
@@ -1,15 +1,11 @@
 import {defineConfig} from 'vite';
+import {readdirSync} from 'fs';
 
-const alias = {
-  '@luma.gl/constants': `${__dirname}/../../../modules/constants/src`,
-  '@luma.gl/core': `${__dirname}/../../../modules/core/src`,
-  '@luma.gl/engine': `${__dirname}/../../../modules/engine/src`,
-  '@luma.gl/experimental': `${__dirname}/../../../modules/experimental/src`,
-  '@luma.gl/webgl-legacy': `${__dirname}/../../../modules/gltf/src`,
-  '@luma.gl/shadertools': `${__dirname}/../../../modules/shadertools/src`,
-  '@luma.gl/test-utils': `${__dirname}/../../../modules/test-utils/src`,
-  '@luma.gl/webgl': `${__dirname}/../../../modules/webgl/src`
-};
+const MODULES_DIR = `${__dirname}/../../../modules`;
+const modules = readdirSync(MODULES_DIR);
+const alias = Object.fromEntries(
+  modules.map(module => [`@luma.gl/${module}`, `${MODULES_DIR}/${module}/src`])
+);
 
 // https://vitejs.dev/config/
 export default defineConfig({

diff --git a/examples/tutorials/hello-gltf/package.json b/examples/tutorials/hello-gltf/package.json
@@ -10,12 +10,12 @@
   "dependencies": {
     "@loaders.gl/core": "^4.2.0",
     "@loaders.gl/gltf": "^4.2.0",
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/gltf": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
-    "@luma.gl/webgpu": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/gltf": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
+    "@luma.gl/webgpu": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/tutorials/hello-instanced-cubes/package.json b/examples/tutorials/hello-instanced-cubes/package.json
@@ -8,11 +8,11 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17",
-    "@luma.gl/webgpu": "9.1.0-alpha.17",
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19",
+    "@luma.gl/webgpu": "9.1.0-alpha.19",
     "@math.gl/core": "4.1.0-alpha.3"
   },
   "devDependencies": {

diff --git a/examples/tutorials/hello-instancing/package.json b/examples/tutorials/hello-instancing/package.json
@@ -8,10 +8,10 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/core": "9.1.0-alpha.17",
-    "@luma.gl/engine": "9.1.0-alpha.17",
-    "@luma.gl/shadertools": "9.1.0-alpha.17",
-    "@luma.gl/webgl": "9.1.0-alpha.17"
+    "@luma.gl/core": "9.1.0-alpha.19",
+    "@luma.gl/engine": "9.1.0-alpha.19",
+    "@luma.gl/shadertools": "9.1.0-alpha.19",
+    "@luma.gl/webgl": "9.1.0-alpha.19"
   },
   "devDependencies": {
     "typescript": "^5.5.0",