@luma.gl/effects 9.2.6 → 9.3.0-alpha.10

package/src/passes/postprocessing/image-blur-filters/tiltshift.ts

@@ -6,7 +6,7 @@ import type {ShaderPass} from '@luma.gl/shadertools';
 import {random} from '@luma.gl/shadertools';
 
 const source = /* wgsl */ `\
-uniform tiltShiftUniforms {
+struct tiltShiftUniforms {
   blurRadius: f32,
   gradientRadius: f32,
   start: vec2f,
@@ -14,40 +14,58 @@ uniform tiltShiftUniforms {
   invert: u32,
 };
 
-@group(0) @binding(1) var<uniform> tiltShift: tiltShiftUniforms;
+@group(0) @binding(auto) var<uniform> tiltShift: tiltShiftUniforms;
 
-fn tiltShift_getDelta(vec2 texSize) -> vec2f {
-  vec2 vector = normalize((tiltShift.end - tiltShift.start) * texSize);
-  return tiltShift.invert ? vec2(-vector.y, vector.x) : vector;
+fn tiltShift_getDelta(texSize: vec2f) -> vec2f {
+  let vector = normalize((tiltShift.end - tiltShift.start) * texSize);
+  return select(vector, vec2f(-vector.y, vector.x), tiltShift.invert != 0u);
 }
 
-fn tiltShift_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
-  vec4 color = vec4(0.0);
-  float total = 0.0;
+fn tiltShift_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  var color = vec4f(0.0);
+  var total = 0.0;
 
   /* randomize the lookup values to hide the fixed number of samples */
-  float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);
-
-  vec2 normal = normalize(vec2((tiltShift.start.y - tiltShift.end.y) * texSize.y, (tiltShift.end.x - tiltShift.start.x) * texSize.x));
-  float radius = smoothstep(0.0, 1.0,
-    abs(dot(texCoord * texSize - tiltShift.start * texSize, normal)) / tiltShift.gradientRadius) * tiltShift.blurRadius;
-
-  for (float t = -30.0; t <= 30.0; t++) {
-    float percent = (t + offset - 0.5) / 30.0;
-    float weight = 1.0 - abs(percent);
-    vec4 offsetColor = texture(source, texCoord + tiltShift_getDelta(texSize) / texSize * percent * radius);
+  let offset = random(vec3f(12.9898, 78.233, 151.7182), 0.0);
+
+  let normal = normalize(
+    vec2f(
+      (tiltShift.start.y - tiltShift.end.y) * texSize.y,
+      (tiltShift.end.x - tiltShift.start.x) * texSize.x
+    )
+  );
+  let radius =
+    smoothstep(
+      0.0,
+      1.0,
+      abs(dot(texCoord * texSize - tiltShift.start * texSize, normal)) / tiltShift.gradientRadius
+    ) * tiltShift.blurRadius;
+
+  for (var t = -30.0; t <= 30.0; t += 1.0) {
+    let percent = (t + offset - 0.5) / 30.0;
+    let weight = 1.0 - abs(percent);
+    let offsetColor = textureSample(
+      sourceTexture,
+      sourceTextureSampler,
+      texCoord + tiltShift_getDelta(texSize) / texSize * percent * radius
+    );
 
     color += offsetColor * weight;
     total += weight;
   }
 
-  color = color / total;
+  color /= total;
   return color;
 }
 `;
 
 const fs = /* glsl */ `\
-uniform tiltShiftUniforms {
+layout(std140) uniform tiltShiftUniforms {
   float blurRadius;
   float gradientRadius;
   vec2 start;

package/src/passes/postprocessing/image-blur-filters/triangleblur.ts

@@ -6,45 +6,54 @@ import type {ShaderPass} from '@luma.gl/shadertools';
 import {random} from '@luma.gl/shadertools';
 
 const source = /* wgsl */ `\
-uniform triangleBlurUniforms {
+struct triangleBlurUniforms {
   radius: f32,
   delta: vec2f,
-}
+};
 
-@group(0) @binding(1) var<uniform> triangleBlur: triangleBlurUniforms;
+@group(0) @binding(auto) var<uniform> triangleBlur: triangleBlurUniforms;
 
-vec4 triangleBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
-  vec2 adjustedDelta = triangleBlur.delta * triangleBlur.radius / texSize;
+fn triangleBlur_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  let adjustedDelta = triangleBlur.delta * triangleBlur.radius / texSize;
 
-  vec4 color = vec4(0.0);
-  float total = 0.0;
+  var color = vec4f(0.0);
+  var total = 0.0;
 
   /* randomize the lookup values to hide the fixed number of samples */
-  float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);
+  let offset = random(vec3f(12.9898, 78.233, 151.7182), 0.0);
 
-  for (float t = -30.0; t <= 30.0; t++) {
-    float percent = (t + offset - 0.5) / 30.0;
-    float weight = 1.0 - abs(percent);
-    vec4 offsetColor = texture(source, texCoord + adjustedDelta * percent);
+  for (var t = -30.0; t <= 30.0; t += 1.0) {
+    let percent = (t + offset - 0.5) / 30.0;
+    let weight = 1.0 - abs(percent);
+    let offsetColor = textureSample(
+      sourceTexture,
+      sourceTextureSampler,
+      texCoord + adjustedDelta * percent
+    );
 
     /* switch to pre-multiplied alpha to correctly blur transparent images */
-    offsetColor.rgb *= offsetColor.a;
+    let premultipliedOffsetColor = vec4f(offsetColor.rgb * vec3f(offsetColor.a), offsetColor.a);
 
-    color += offsetColor * weight;
+    color += premultipliedOffsetColor * weight;
     total += weight;
   }
 
-  color = color / total;
+  color /= total;
 
   /* switch back from pre-multiplied alpha */
-  color.rgb /= color.a + 0.00001;
+  let unpremultipliedRgb = color.rgb / vec3f(color.a + 0.00001);
 
-  return color;
+  return vec4f(unpremultipliedRgb, color.a);
 }
 `;
 
 const fs = /* glsl */ `\
-uniform triangleBlurUniforms {
+layout(std140) uniform triangleBlurUniforms {
   float radius;
   vec2 delta;
 } triangleBlur;

package/src/passes/postprocessing/image-blur-filters/zoomblur.ts

@@ -6,37 +6,46 @@ import type {ShaderPass} from '@luma.gl/shadertools';
 import {random} from '@luma.gl/shadertools';
 
 const source = /* wgsl */ `
-uniform zoomBlurUniforms {
+struct zoomBlurUniforms {
   center: vec2f,
   strength: f32,
 };
 
-@group(0) @binding(1) var<uniform> zoomBlur : zoomBlurUniforms;
+@group(0) @binding(auto) var<uniform> zoomBlur : zoomBlurUniforms;
 
 
-fn zoomBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
-  vec4 color = vec4(0.0);
-  float total = 0.0;
-  vec2 toCenter = zoomBlur.center * texSize - texCoord * texSize;
+fn zoomBlur_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  var color = vec4f(0.0);
+  var total = 0.0;
+  let toCenter = zoomBlur.center * texSize - texCoord * texSize;
 
   /* randomize the lookup values to hide the fixed number of samples */
-  float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);
-
-  for (float t = 0.0; t <= 40.0; t++) {
-    float percent = (t + offset) / 40.0;
-    float weight = 4.0 * (percent - percent * percent);
-    vec4 offsetColor = texture(source, texCoord + toCenter * percent * zoomBlur.strength / texSize);
+  let offset = random(vec3f(12.9898, 78.233, 151.7182), 0.0);
+
+  for (var t = 0.0; t <= 40.0; t += 1.0) {
+    let percent = (t + offset) / 40.0;
+    let weight = 4.0 * (percent - percent * percent);
+    let offsetColor = textureSample(
+      sourceTexture,
+      sourceTextureSampler,
+      texCoord + toCenter * percent * zoomBlur.strength / texSize
+    );
     color += offsetColor * weight;
     total += weight;
   }
 
-  color = color / total;
+  color /= total;
   return color;
 }
 `;
 
 const fs = /* glsl */ `
-uniform zoomBlurUniforms {
+layout(std140) uniform zoomBlurUniforms {
   vec2 center;
   float strength;
 } zoomBlur;

package/src/passes/postprocessing/image-fun-filters/colorhalftone.ts

@@ -8,44 +8,46 @@ const source = /* wgsl */ `\
 struct colorHalftoneUniforms {
   center: vec2f,
   angle: f32,
-  size: f32.
+  size: f32,
 };
 
-@group(0) @binding(1) var<uniform> colorHalftone: colorHalftoneUniforms;
+@group(0) @binding(auto) var<uniform> colorHalftone: colorHalftoneUniforms;
 
 fn pattern(angle: f32, scale: f32, texSize: vec2f, texCoord: vec2f) -> f32 {
-  let s: f32 = sin(angle), c = cos(angle);
-  let tex: vec2f = texCoord * texSize - colorHalftone.center * texSize;
-  let point: vec2f = vec2(
-	  c * tex.x - s * tex.y,
-	  s * tex.x + c * tex.y
+  let s = sin(angle);
+  let c = cos(angle);
+  let tex = texCoord * texSize - colorHalftone.center * texSize;
+  let point = vec2f(
+    c * tex.x - s * tex.y,
+    s * tex.x + c * tex.y
   ) * scale;
   return (sin(point.x) * sin(point.y)) * 4.0;
 }
 
-fn colorHalftone_filterColor_ext(vec4f color, vec2f texSize, vec2f texCoord) -> vec4f {
-  let scale: f32 = 3.1514 / colorHalftone.size;
-  let cmy: vec3f = 1.0 - color.rgb;
-  let k: f32 = min(cmy.x, min(cmy.y, cmy.z));
+fn colorHalftone_filterColor_ext(color: vec4f, texSize: vec2f, texCoord: vec2f) -> vec4f {
+  let scale = 3.1514 / colorHalftone.size;
+  var cmy = vec3f(1.0) - color.rgb;
+  var k = min(cmy.x, min(cmy.y, cmy.z));
+  let safeDenominator = max(1.0 - k, 0.00001);
 
-  cmy = (cmy - k) / (1.0 - k);
+  cmy = (cmy - vec3f(k)) / safeDenominator;
   cmy = clamp(
-	  cmy * 10.0 - 3.0 + vec3(
+    cmy * 10.0 - vec3f(3.0) + vec3f(
       pattern(colorHalftone.angle + 0.26179, scale, texSize, texCoord),
-	    pattern(colorHalftone.angle + 1.30899, scale, texSize, texCoord),
+      pattern(colorHalftone.angle + 1.30899, scale, texSize, texCoord),
       pattern(colorHalftone.angle, scale, texSize, texCoord)
     ),
-	  0.0,
-	  1.0
+    vec3f(0.0),
+    vec3f(1.0)
   );
   k = clamp(k * 10.0 - 5.0 + pattern(colorHalftone.angle + 0.78539, scale, texSize, texCoord), 0.0, 1.0);
-  return vec4(1.0 - cmy - k, color.a);
+  return vec4f(vec3f(1.0) - cmy - vec3f(k), color.a);
 }
 `;
 
 // TODO pass texCoord to angle
 const fs = /* glsl */ `\
-uniform colorHalftoneUniforms {
+layout(std140) uniform colorHalftoneUniforms {
   vec2 center;
   float angle;
   float size;

package/src/passes/postprocessing/image-fun-filters/dotscreen.ts

@@ -5,34 +5,34 @@
 import type {ShaderPass} from '@luma.gl/shadertools';
 
 const source = /* wgsl */ `\
-uniform dotScreenUniforms {
+struct dotScreenUniforms {
   center: vec2f,
   angle: f32,
   size: f32,
 };
 
-@group(0) @binding(1) dotScreen: dotScreenUniforms;
+@group(0) @binding(auto) var<uniform> dotScreen: dotScreenUniforms;
 
 fn pattern(texSize: vec2f, texCoord: vec2f) -> f32 {
-  let scale: f32 = 3.1415 / dotScreen.size;
-
-  let s: f32 = sin(dotScreen.angle), c = cos(dotScreen.angle);
-  tex: vec2f = texCoord * texSize - dotScreen.center * texSize;
-  point = vec2f( 
-    c: * tex.x - s * tex.y,
+  let scale = 3.1415 / dotScreen.size;
+  let s = sin(dotScreen.angle);
+  let c = cos(dotScreen.angle);
+  let tex = texCoord * texSize - dotScreen.center * texSize;
+  let point = vec2f(
+    c * tex.x - s * tex.y,
     s * tex.x + c * tex.y
   ) * scale;
   return (sin(point.x) * sin(point.y)) * 4.0;
 }
 
-fn dotScreen_filterColor_ext(vec4 color, texSize: vec2f, texCoord: vec2f) -> vec4f {
-  let average: f32 = (color.r + color.g + color.b) / 3.0;
-  return vec4(vec3(average * 10.0 - 5.0 + pattern(texSize, texCoord)), color.a);
+fn dotScreen_filterColor_ext(color: vec4f, texSize: vec2f, texCoord: vec2f) -> vec4f {
+  let average = (color.r + color.g + color.b) / 3.0;
+  return vec4f(vec3f(average * 10.0 - 5.0 + pattern(texSize, texCoord)), color.a);
 }
 `;
 
 const fs = /* glsl */ `\
-uniform dotScreenUniforms {
+layout(std140) uniform dotScreenUniforms {
   vec2 center;
   float angle;
   float size;

package/src/passes/postprocessing/image-fun-filters/edgework.ts

@@ -8,25 +8,35 @@ import {random} from '@luma.gl/shadertools';
 const source = /* wgsl */ `\
 struct edgeWorkUniforms {
   radius: f32,
-  int mode: uint32,
+  mode: u32,
 };
 
-@group(0) @binding(1) var<uniform> edgeWork: edgeWorkUniforms;
+@group(0) @binding(auto) var<uniform> edgeWork: edgeWorkUniforms;
 
-fn edgeWork_sampleColorRGB(sampler2D source, vec2 texSize, vec2 texCoord, vec2 delta) -> vec4f {
-  vec2 relativeDelta = edgeWork.radius * delta / texSize;
+fn edgeWork_sampleColorRGB(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f,
+  delta: vec2f
+) -> vec4f {
+  let relativeDelta = edgeWork.radius * delta / texSize;
 
-  vec2 color = vec2(0.0);
-  vec2 total = vec2(0.0);
+  var color = vec2f(0.0);
+  var total = vec2f(0.0);
 
   /* randomize the lookup values to hide the fixed number of samples */
-  float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);
-
-  for (float t = -30.0; t <= 30.0; t++) {
-    float percent = (t + offset - 0.5) / 30.0;
-    float weight = 1.0 - abs(percent);
-    vec3 sampleColor = texture(source, texCoord + relativeDelta * percent).rgb;
-    float average = (sampleColor.r + sampleColor.g + sampleColor.b) / 3.0;
+  let offset = random(vec3f(12.9898, 78.233, 151.7182), 0.0);
+
+  for (var t = -30.0; t <= 30.0; t += 1.0) {
+    let percent = (t + offset - 0.5) / 30.0;
+    var weight = 1.0 - abs(percent);
+    let sampleColor = textureSample(
+      sourceTexture,
+      sourceTextureSampler,
+      texCoord + relativeDelta * percent
+    ).rgb;
+    let average = (sampleColor.r + sampleColor.g + sampleColor.b) / 3.0;
     color.x += average * weight;
     total.x += weight;
     if (abs(t) < 15.0) {
@@ -35,12 +45,73 @@ fn edgeWork_sampleColorRGB(sampler2D source, vec2 texSize, vec2 texCoord, vec2 d
       total.y += weight;
     }
   }
-  return vec4(color / total, 0.0, 1.0);
+  return vec4f(color / total, 0.0, 1.0);
+}
+
+fn edgeWork_sampleColorXY(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f,
+  delta: vec2f
+) -> vec4f {
+  let relativeDelta = edgeWork.radius * delta / texSize;
+
+  var color = vec2f(0.0);
+  var total = vec2f(0.0);
+
+  /* randomize the lookup values to hide the fixed number of samples */
+  let offset = random(vec3f(12.9898, 78.233, 151.7182), 0.0);
+
+  for (var t = -30.0; t <= 30.0; t += 1.0) {
+    let percent = (t + offset - 0.5) / 30.0;
+    var weight = 1.0 - abs(percent);
+    let sampleColor = textureSample(
+      sourceTexture,
+      sourceTextureSampler,
+      texCoord + relativeDelta * percent
+    ).xy;
+    color.x += sampleColor.x * weight;
+    total.x += weight;
+    if (abs(t) < 15.0) {
+      weight = weight * 2.0 - 1.0;
+      color.y += sampleColor.y * weight;
+      total.y += weight;
+    }
+  }
+
+  let c = clamp(10000.0 * (color.y / total.y - color.x / total.x) + 0.5, 0.0, 1.0);
+  return vec4f(c, c, c, 1.0);
+}
+
+fn edgeWork_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  if (edgeWork.mode == 0u) {
+    return edgeWork_sampleColorRGB(
+      sourceTexture,
+      sourceTextureSampler,
+      texSize,
+      texCoord,
+      vec2f(1.0, 0.0)
+    );
+  }
+
+  return edgeWork_sampleColorXY(
+    sourceTexture,
+    sourceTextureSampler,
+    texSize,
+    texCoord,
+    vec2f(0.0, 1.0)
+  );
 }
 `;
 
 const fs = /* glsl */ `\
-uniform edgeWorkUniforms {
+layout(std140) uniform edgeWorkUniforms {
   float radius;
   int mode;
 } edgeWork;

package/src/passes/postprocessing/image-fun-filters/hexagonalpixelate.ts

@@ -10,49 +10,61 @@ struct hexagonalPixelateUniforms {
   scale: f32,
 };
 
-@group(0) @binding(1) var<uniform> hexagonalPixelate: hexagonalPixelateUniforms;
-
-fn hexagonalPixelate_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
-  vec2 tex = (texCoord * texSize - hexagonalPixelate.center * texSize) / hexagonalPixelate.scale;
+@group(0) @binding(auto) var<uniform> hexagonalPixelate: hexagonalPixelateUniforms;
+
+fn hexagonalPixelate_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  var tex = (texCoord * texSize - hexagonalPixelate.center * texSize) / hexagonalPixelate.scale;
   tex.y /= 0.866025404;
   tex.x -= tex.y * 0.5;
 
-  vec2 a;
+  var a = vec2f(0.0);
   if (tex.x + tex.y - floor(tex.x) - floor(tex.y) < 1.0) {
-    a = vec2(floor(tex.x), floor(tex.y));
+    a = vec2f(floor(tex.x), floor(tex.y));
+  } else {
+    a = vec2f(ceil(tex.x), ceil(tex.y));
   }
-  else a = vec2(ceil(tex.x), ceil(tex.y));
-  vec2 b = vec2(ceil(tex.x), floor(tex.y));
-  vec2 c = vec2(floor(tex.x), ceil(tex.y));
-
-  vec3 TEX = vec3(tex.x, tex.y, 1.0 - tex.x - tex.y);
-  vec3 A = vec3(a.x, a.y, 1.0 - a.x - a.y);
-  vec3 B = vec3(b.x, b.y, 1.0 - b.x - b.y);
-  vec3 C = vec3(c.x, c.y, 1.0 - c.x - c.y);
-
-  float alen = length(TEX - A);
-  float blen = length(TEX - B);
-  float clen = length(TEX - C);
-
-  vec2 choice;
-  if (alen < blen) {
-    if (alen < clen) choice = a;
-    else choice = c;
+  let b = vec2f(ceil(tex.x), floor(tex.y));
+  let c = vec2f(floor(tex.x), ceil(tex.y));
+
+  let texBarycentric = vec3f(tex.x, tex.y, 1.0 - tex.x - tex.y);
+  let aBarycentric = vec3f(a.x, a.y, 1.0 - a.x - a.y);
+  let bBarycentric = vec3f(b.x, b.y, 1.0 - b.x - b.y);
+  let cBarycentric = vec3f(c.x, c.y, 1.0 - c.x - c.y);
+
+  let aLength = length(texBarycentric - aBarycentric);
+  let bLength = length(texBarycentric - bBarycentric);
+  let cLength = length(texBarycentric - cBarycentric);
+
+  var choice = vec2f(0.0);
+  if (aLength < bLength) {
+    if (aLength < cLength) {
+      choice = a;
+    } else {
+      choice = c;
+    }
   } else {
-    if (blen < clen) choice = b;
-    else choice = c;
+    if (bLength < cLength) {
+      choice = b;
+    } else {
+      choice = c;
+    }
   }
 
   choice.x += choice.y * 0.5;
   choice.y *= 0.866025404;
   choice *= hexagonalPixelate.scale / texSize;
 
-  return texture(source, choice + hexagonalPixelate.center);
+  return textureSample(sourceTexture, sourceTextureSampler, choice + hexagonalPixelate.center);
 }
 `;
 
 const fs = /* glsl */ `\
-uniform hexagonalPixelateUniforms {
+layout(std140) uniform hexagonalPixelateUniforms {
   vec2 center;
   float scale;
 } hexagonalPixelate;

package/src/passes/postprocessing/image-fun-filters/ink.ts

@@ -5,23 +5,32 @@
 import type {ShaderPass} from '@luma.gl/shadertools';
 
 const source = /* wgsl */ `\
-uniform inkUniforms {
+struct inkUniforms {
   strength: f32,
 };
 
-@group(0) @binding(1) var<uniform> ink: inkUniforms;
+@group(0) @binding(auto) var<uniform> ink: inkUniforms;
 
-fn ink_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
-  vec2 dx = vec2(1.0 / texSize.x, 0.0);
-  vec2 dy = vec2(0.0, 1.0 / texSize.y);
-  vec4 color = texture(source, texCoord);
-  float bigTotal = 0.0;
-  float smallTotal = 0.0;
-  vec3 bigAverage = vec3(0.0);
-  vec3 smallAverage = vec3(0.0);
-  for (float x = -2.0; x <= 2.0; x += 1.0) {
-    for (float y = -2.0; y <= 2.0; y += 1.0) {
-      vec3 offsetColor = texture(source, texCoord + dx * x + dy * y).rgb;
+fn ink_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  let dx = vec2f(1.0 / texSize.x, 0.0);
+  let dy = vec2f(0.0, 1.0 / texSize.y);
+  let color = textureSample(sourceTexture, sourceTextureSampler, texCoord);
+  var bigTotal = 0.0;
+  var smallTotal = 0.0;
+  var bigAverage = vec3f(0.0);
+  var smallAverage = vec3f(0.0);
+  for (var x = -2.0; x <= 2.0; x += 1.0) {
+    for (var y = -2.0; y <= 2.0; y += 1.0) {
+      let offsetColor = textureSample(
+        sourceTexture,
+        sourceTextureSampler,
+        texCoord + dx * x + dy * y
+      ).rgb;
       bigAverage += offsetColor;
       bigTotal += 1.0;
       if (abs(x) + abs(y) < 2.0) {
@@ -30,14 +39,14 @@ fn ink_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
       }
     }
   }
-  vec3 edge = max(vec3(0.0), bigAverage / bigTotal - smallAverage / smallTotal);
-  float power = ink.strength * ink.strength * ink.strength * ink.strength * ink.strength;
-  return vec4(color.rgb - dot(edge, edge) * power * 100000.0, color.a);
+  let edge = max(vec3f(0.0), bigAverage / bigTotal - smallAverage / smallTotal);
+  let power = ink.strength * ink.strength * ink.strength * ink.strength * ink.strength;
+  return vec4f(color.rgb - vec3f(dot(edge, edge) * power * 100000.0), color.a);
 }
 `;
 
 const fs = /* glsl */ `\
-uniform inkUniforms {
+layout(std140) uniform inkUniforms {
   float strength;
 } ink;
 

package/src/passes/postprocessing/image-fun-filters/magnify.ts

@@ -5,32 +5,42 @@
 import type {ShaderPass} from '@luma.gl/shadertools';
 
 const source = /* wgsl */ `\
-uniform magnifyUniforms {
-  screenXY: vec2f;
-  radiusPixels: f32;
-  zoom: f32;
-  borderWidthPixels: f32;
-  borderColor: vec4f;
+struct magnifyUniforms {
+  screenXY: vec2f,
+  radiusPixels: f32,
+  zoom: f32,
+  borderWidthPixels: f32,
+  borderColor: vec4f,
 };
 
-@group(0) @binding(1) var<uniform> magnify: magnifyUniforms;
+@group(0) @binding(auto) var<uniform> magnify: magnifyUniforms;
 
-fn magnify_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) -> vec4f {
-  vec2 pos = vec2(magnify.screenXY.x, 1.0 - magnify.screenXY.y);
-  float dist = distance(texCoord * texSize, pos * texSize);
+fn magnify_sampleColor(
+  sourceTexture: texture_2d<f32>,
+  sourceTextureSampler: sampler,
+  texSize: vec2f,
+  texCoord: vec2f
+) -> vec4f {
+  let pos = vec2f(magnify.screenXY.x, 1.0 - magnify.screenXY.y);
+  let dist = distance(texCoord * texSize, pos * texSize);
   if (dist < magnify.radiusPixels) {
-    return texture(source, (texCoord - pos) / magnify.zoom + pos);
+    return textureSampleLevel(
+      sourceTexture,
+      sourceTextureSampler,
+      (texCoord - pos) / magnify.zoom + pos,
+      0.0
+    );
   }
 
   if (dist <= magnify.radiusPixels + magnify.borderWidthPixels) {
     return magnify.borderColor;
   }
-  return texture(source, texCoord);
+  return textureSampleLevel(sourceTexture, sourceTextureSampler, texCoord, 0.0);
 }
 `;
 
 const fs = /* glsl */ `\
-uniform magnifyUniforms {
+layout(std140) uniform magnifyUniforms {
   vec2 screenXY;
   float radiusPixels;
   float zoom;