@tinypoly/gpu-renderer 0.1.1 → 0.2.1

package/dist/wgsl/pathTrace.wgsl.js

@@ -42,7 +42,9 @@ fn backgroundRadiance(direction: vec3<f32>) -> vec3<f32> {
     return frame.background.rgb;
   }
 
-  // A procedural sky paints the background without the strength it lights with, and its foreground over it.
+  // A procedural sky paints the background with the strength it lights with, and its foreground over it. The CPU
+  // renderer leaves that strength out of what the camera sees, which a renderer exposing for the light cannot: the sky
+  // that lights a wall five times brighter than itself would show as a dark band behind it.
   if (frame.skyProgram != NO_PROGRAM || frame.skyIntensity > 0.0) {
     if (frame.skyBackground == 0u) {
       return vec3<f32>(0.0);
@@ -54,10 +56,10 @@ fn backgroundRadiance(direction: vec3<f32>) -> vec3<f32> {
       input.direction = direction;
       input.diffuseColor = vec4<f32>(1.0);
 
-      return runProgram(frame.skyProgram, input).color.rgb;
+      return runProgram(frame.skyProgram, input).color.rgb * frame.skyIntensity;
     }
 
-    return environmentRadiance(direction) / frame.skyIntensity;
+    return environmentRadiance(direction);
   }
 
   return environmentRadiance(direction);
@@ -67,7 +69,7 @@ fn backgroundRadiance(direction: vec3<f32>) -> vec3<f32> {
  * How much of the sky a bounce ray that escaped keeps. Direct sampling aims at the bright parts of an image too, so the
  * two share it; when direct sampling took all of it, as it does from a toon surface, the bounce keeps none.
  */
-fn escapeWeight(direction: vec3<f32>, bsdfPdf: f32, lightsOwnDirect: bool) -> f32 {
+fn escapeWeight(direction: vec3<f32>, bsdfPdf: f32, lightsOwnDirect: bool, scatteredAt: vec3<f32>) -> f32 {
   if (frame.environmentPick <= 0.0) {
     return 1.0;
   }
@@ -80,7 +82,8 @@ fn escapeWeight(direction: vec3<f32>, bsdfPdf: f32, lightsOwnDirect: bool) -> f3
     return 1.0;
   }
 
-  return misWeight(bsdfPdf, frame.environmentPick * environmentPdf(direction));
+  // The sky was aimed at from the vertex the bounce left, through its windows as well when that vertex is inside.
+  return misWeight(bsdfPdf, frame.environmentPick * skyPdf(scatteredAt, direction, portalChance(scatteredAt)));
 }
 
 /** Scales a contribution down to the luminance ceiling, which trades a little bias for the fireflies it removes. */
@@ -548,7 +551,7 @@ fn traceRadiance(
         if (escapeMap != NO_TEXTURE) {
           sky = sky + sampleEquirect(escapeMap, direction).rgb * escapeIntensity;
         } else {
-          sky = sky + environmentRadiance(direction) * escapeWeight(direction, bsdfPdf, lightsOwnDirect);
+          sky = sky + environmentRadiance(direction) * escapeWeight(direction, bsdfPdf, lightsOwnDirect, lastPosition);
         }
 
         let contribution = throughput * sky;
@@ -703,8 +706,14 @@ fn traceRadiance(
       depth = length(point - rayOrigin);
     }
 
+    // A window the camera ray goes straight through is not what the camera sees: what lies behind it is, so the
+    // denoiser takes its guides there, and the air its distance. Glass has next to no diffuse colour and one flat
+    // normal, which would leave everything seen through it unfiltered. The window's own guides stand until then, for
+    // the paths that reflect off it instead.
+    let window = surface.transmission > 0.0 && surface.thickness <= 0.0;
+
     if (straight && !guided) {
-      guided = true;
+      guided = !window;
       diffuseAlbedo = diffuseGuide(surface);
       specularAlbedoGuide = select(specularAlbedo(surface, -direction), vec3<f32>(1.0), (surface.flags & MATERIAL_LIT) == 0u);
       guideNormal = surface.normal;
@@ -745,7 +754,7 @@ fn traceRadiance(
         }
       }
 
-      if (!hazed && frame.atmosphereColor.w > 0.0) {
+      if (!hazed && !window && frame.atmosphereColor.w > 0.0) {
         hazed = true;
         // From the eye, where the camera ray only starts on the near plane; an orthographic view has no eye.
         hazeDistance = length(point - select(frame.cameraToWorld[3].xyz, rayOrigin, frame.cameraKind == 1u));
@@ -765,7 +774,11 @@ fn traceRadiance(
     }
 
     // Three does not light a basic, points, line or sprite material, so nothing carries on from one.
-    if ((surface.flags & MATERIAL_LIT) == 0u || bounce >= frame.bounces) {
+    // Past the last bounce a path still crosses a window straight on, which scatters nothing, to find the sky behind
+    // it: cut there, the daylight a room gets through its glazing would go missing from every last bounce.
+    let spent = bounce >= frame.bounces;
+
+    if ((surface.flags & MATERIAL_LIT) == 0u || (spent && !window)) {
       break;
     }
 
@@ -788,8 +801,105 @@ fn traceRadiance(
     var nextOrigin = point + direction * RAY_EPSILON;
 
     // Transmission replaces part of the diffuse layer, so that share of the time the surface is a dielectric instead.
-    // Choosing it in proportion to its weight leaves both halves unweighted, and only the opaque half aims at a light.
-    if (surface.transmission > 0.0 && lobe.y < surface.transmission) {
+    // Choosing it in proportion to its weight leaves both halves unweighted. The opaque half aims at a light; on a
+    // window that lets only part of the light through, it does so on every path, weighed by its share, rather than on
+    // the paths that chose it: a sunlit pane seen against a dim room would otherwise be lit on one path in five and
+    // dark on the rest, which is the grain glass shows.
+    let dielectric = surface.transmission > 0.0 && lobe.y < surface.transmission;
+    let windowLight = window && !spent && surface.transmission < 1.0 && surface.subsurface <= 0.0;
+
+    if (!dielectric || windowLight) {
+      var chance = 0.0;
+
+      if (!dielectric) {
+        // Light that enters the material: a random walk inside it from here, in place of the share of the diffuse
+        // layer that scatters inside. Chosen by chance, so neither branch is weighted against the other.
+        // The window's opaque share is a surface like any other, which a spent path stops at.
+        if (spent) {
+          break;
+        }
+
+        if (SUBSURFACE_WALK) {
+          chance = subsurfaceChance(surface, view);
+        }
+
+        if (SUBSURFACE_WALK && lobe.x < chance) {
+          let medium = materials[surface.material].subsurface;
+
+          throughput = throughput
+            * ((1.0 - surface.metalness) * surface.subsurface * coatTransmittance(surface, view) / chance);
+          sigma = vec3<f32>(1.0) / max(medium.rgb, vec3<f32>(1e-6));
+          walkAlbedo = subsurfaceAlbedo(surface.albedo);
+          walkG = materials[surface.material].subsurfaceAnisotropy;
+          walkSteps = 0u;
+
+          // Light that scattered inside is diffuse light, which is the signal it feeds.
+          if (!split) {
+            split = true;
+            splitBase = radiance;
+            splitDiffuse = true;
+          }
+
+          inMedium = true;
+          primary = false;
+          straight = false;
+          bsdfPdf = 0.0;
+          lightsOwnDirect = false;
+          escapeMap = NO_TEXTURE;
+          bounce = bounce + 1u;
+          direction = cosineDirection(-surface.facing, bounceSample);
+          origin = point - surface.facing * RAY_EPSILON;
+          limit = walkDistance(throughput, sigma, pick, &walkOdds);
+          continue;
+        }
+
+        throughput = throughput / (1.0 - chance);
+      }
+
+      let position = point + surface.normal * RAY_EPSILON;
+      var directDiffuse: vec3<f32>;
+      let lit = select(throughput, throughput * (1.0 - surface.transmission), windowLight);
+      let direct = lit * directLight(surface, position, view, pick.x, lightSample, rng, &directDiffuse,
+        select(0.0, volumeDensity, inVolume));
+      let added = select(direct, clampIndirect(direct), bounce > 0u);
+      let before = radiance;
+
+      radiance = radiance + added;
+
+      if (!dielectric) {
+        let scattered = sampleBsdf(surface, view, (lobe.x - chance) / (1.0 - chance), bounceSample);
+
+        // The first scatter splits the path: its direct light by lobe, and everything after it by the lobe it chose.
+        if (!split) {
+          split = true;
+          splitBase = before;
+          splitDirect = added;
+          splitDirectDiffuse = lit * directDiffuse * select(1.0, luminanceOf(added) / max(luminanceOf(direct), 1e-20),
+            bounce > 0u);
+          splitDiffuse = !scattered.valid || scattered.diffuse;
+          waitingForSpecular = scattered.valid && !scattered.diffuse;
+        }
+
+        if (!scattered.valid) {
+          break;
+        }
+
+        throughput = throughput * scattered.weight;
+        bsdfPdf = scattered.pdf;
+        lastPosition = position;
+        lastNormal = treeNormal(surface);
+        lightsOwnDirect = surface.kind == KIND_TOON;
+        escapeMap = surface.envMap;
+        escapeIntensity = surface.envMapIntensity;
+        next = scattered.direction;
+        nextOrigin = position;
+        primary = false;
+        straight = false;
+        bounce = bounce + 1u;
+      }
+    }
+
+    if (dielectric) {
       var ior = surface.ior;
 
       // Three's dispersion: each colour refracts with its own index, spread around the material's. The path picks one
@@ -809,7 +919,8 @@ fn traceRadiance(
 
       let crossing = sampleDielectric(surface, view, ior, lobe.y / surface.transmission, bounceSample);
 
-      if (!crossing.valid) {
+      // A reflection off the glass is a scattering, which a spent path no longer has.
+      if (!crossing.valid || (spent && !crossing.straight)) {
         break;
       }
 
@@ -844,85 +955,6 @@ fn traceRadiance(
       if (!primary) {
         bounce = bounce + 1u;
       }
-    } else {
-      // Light that enters the material: a random walk inside it from here, in place of the share of the diffuse
-      // layer that scatters inside. Chosen by chance, so neither branch is weighted against the other.
-      var chance = 0.0;
-
-      if (SUBSURFACE_WALK) {
-        chance = subsurfaceChance(surface, view);
-      }
-
-      if (SUBSURFACE_WALK && lobe.x < chance) {
-        let medium = materials[surface.material].subsurface;
-
-        throughput = throughput
-          * ((1.0 - surface.metalness) * surface.subsurface * coatTransmittance(surface, view) / chance);
-        sigma = vec3<f32>(1.0) / max(medium.rgb, vec3<f32>(1e-6));
-        walkAlbedo = subsurfaceAlbedo(surface.albedo);
-        walkG = materials[surface.material].subsurfaceAnisotropy;
-        walkSteps = 0u;
-
-        // Light that scattered inside is diffuse light, which is the signal it feeds.
-        if (!split) {
-          split = true;
-          splitBase = radiance;
-          splitDiffuse = true;
-        }
-
-        inMedium = true;
-        primary = false;
-        straight = false;
-        bsdfPdf = 0.0;
-        lightsOwnDirect = false;
-        escapeMap = NO_TEXTURE;
-        bounce = bounce + 1u;
-        direction = cosineDirection(-surface.facing, bounceSample);
-        origin = point - surface.facing * RAY_EPSILON;
-        limit = walkDistance(throughput, sigma, pick, &walkOdds);
-        continue;
-      }
-
-      throughput = throughput / (1.0 - chance);
-
-      let position = point + surface.normal * RAY_EPSILON;
-      var directDiffuse: vec3<f32>;
-      let direct = throughput * directLight(surface, position, view, pick.x, lightSample, rng, &directDiffuse,
-        select(0.0, volumeDensity, inVolume));
-      let added = select(direct, clampIndirect(direct), bounce > 0u);
-      let before = radiance;
-
-      radiance = radiance + added;
-
-      let scattered = sampleBsdf(surface, view, (lobe.x - chance) / (1.0 - chance), bounceSample);
-
-      // The first scatter splits the path: its direct light by lobe, and everything after it by the lobe it chose.
-      if (!split) {
-        split = true;
-        splitBase = before;
-        splitDirect = added;
-        splitDirectDiffuse = throughput * directDiffuse * select(1.0, luminanceOf(added) / max(luminanceOf(direct), 1e-20),
-          bounce > 0u);
-        splitDiffuse = !scattered.valid || scattered.diffuse;
-        waitingForSpecular = scattered.valid && !scattered.diffuse;
-      }
-
-      if (!scattered.valid) {
-        break;
-      }
-
-      throughput = throughput * scattered.weight;
-      bsdfPdf = scattered.pdf;
-      lastPosition = position;
-      lastNormal = treeNormal(surface);
-      lightsOwnDirect = surface.kind == KIND_TOON;
-      escapeMap = surface.envMap;
-      escapeIntensity = surface.envMapIntensity;
-      next = scattered.direction;
-      nextOrigin = position;
-      primary = false;
-      straight = false;
-      bounce = bounce + 1u;
     }
 
     // A path that carries almost nothing is ended by chance rather than by a cut, which keeps the estimate unbiased.

package/dist/wgsl/pathTrace.wgsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathTrace.wgsl.js","sourceRoot":"","sources":["../../src/wgsl/pathTrace.wgsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAy3CzC,CAAC"}
+{"version":3,"file":"pathTrace.wgsl.js","sourceRoot":"","sources":["../../src/wgsl/pathTrace.wgsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAy5CzC,CAAC"}

package/dist/wgsl/present.wgsl.d.ts

@@ -3,5 +3,5 @@
  * vignette and grain. The operators are ports of `color.ts` in the CPU renderer, which are in turn Three's ACES, AgX
  * and Khronos neutral curves, so the two renderers agree on the display transform even when they disagree on the light.
  */
-export declare const PRESENT_WGSL = "\nstruct Present {\n  resolution: vec2<u32>,\n  exposure: f32,\n  toneMapping: u32,\n  vignette: f32,\n  grain: f32,\n  frameIndex: u32,\n  // A transparent background: the canvas gets the coverage as alpha, premultiplied as it is configured.\n  transparent: u32,\n  // Whether the colour comes from the denoiser's output rather than straight from the accumulation.\n  denoised: u32,\n};\n\n@group(0) @binding(0) var<uniform> present: Present;\n@group(0) @binding(1) var<storage, read> accumulation: array<vec4<f32>>;\n@group(0) @binding(2) var<storage, read> denoised: array<vec4<f32>>;\n\n@vertex\nfn vertexMain(@builtin(vertex_index) index: u32) -> @builtin(position) vec4<f32> {\n  // One oversized triangle covers the viewport with no vertex buffer.\n  let x = f32(index / 2u) * 4.0 - 1.0;\n  let y = f32(index & 1u) * 4.0 - 1.0;\n\n  return vec4<f32>(x, y, 0.0, 1.0);\n}\n\nfn toneMapAces(color: vec3<f32>) -> vec3<f32> {\n  let toAces = mat3x3<f32>(\n    vec3<f32>(0.59719, 0.076, 0.0284),\n    vec3<f32>(0.35458, 0.90834, 0.13383),\n    vec3<f32>(0.04823, 0.01566, 0.83777));\n  let fromAces = mat3x3<f32>(\n    vec3<f32>(1.60475, -0.10208, -0.00327),\n    vec3<f32>(-0.53108, 1.10813, -0.07276),\n    vec3<f32>(-0.07367, -0.00605, 1.07602));\n  let v = toAces * (color / 0.6);\n\n  return fromAces * ((v * (v + 0.0245786) - 0.000090537) / (v * (0.983729 * v + 0.432951) + 0.238081));\n}\n\nfn toneMapAgx(color: vec3<f32>) -> vec3<f32> {\n  let toAgx = mat3x3<f32>(\n    vec3<f32>(0.6274, 0.0691, 0.0164),\n    vec3<f32>(0.3293, 0.9195, 0.088),\n    vec3<f32>(0.0433, 0.0113, 0.8956));\n  let inset = mat3x3<f32>(\n    vec3<f32>(0.856627153315983, 0.137318972929847, 0.11189821299995),\n    vec3<f32>(0.0951212405381588, 0.761241990602591, 0.0767994186031903),\n    vec3<f32>(0.0482516061458583, 0.101439036467562, 0.811302368396859));\n  let outset = mat3x3<f32>(\n    vec3<f32>(1.1271005818144368, -0.1413297634984383, -0.14132976349843826),\n    vec3<f32>(-0.11060664309660323, 1.157823702216272, -0.11060664309660294),\n    vec3<f32>(-0.016493938717834573, -0.016493938717834257, 1.2519364065950405));\n  let fromAgx = mat3x3<f32>(\n    vec3<f32>(1.6605, -0.1246, -0.0182),\n    vec3<f32>(-0.5876, 1.1329, -0.1006),\n    vec3<f32>(-0.0728, -0.0083, 1.1187));\n  let logged = inset * (toAgx * color);\n  let x = clamp((log2(max(logged, vec3<f32>(1e-10))) + 12.47393) / 16.499999, vec3<f32>(0.0), vec3<f32>(1.0));\n  let curved = 15.5 * pow(x, vec3<f32>(6.0)) - 40.14 * pow(x, vec3<f32>(5.0)) + 31.96 * pow(x, vec3<f32>(4.0))\n    - 6.868 * pow(x, vec3<f32>(3.0)) + 0.4298 * x * x + 0.1191 * x - 0.00232;\n\n  return fromAgx * pow(max(outset * curved, vec3<f32>(0.0)), vec3<f32>(2.2));\n}\n\nfn toneMapNeutral(color: vec3<f32>) -> vec3<f32> {\n  let low = min(color.r, min(color.g, color.b));\n  let offset = select(0.04, low - 6.25 * low * low, low < 0.08);\n  let shifted = color - offset;\n  let peak = max(shifted.r, max(shifted.g, shifted.b));\n\n  if (peak < 0.76) {\n    return shifted;\n  }\n\n  let newPeak = 1.0 - 0.24 * 0.24 / (peak + 0.24 - 0.76);\n  let g = 1.0 - 1.0 / (0.15 * (peak - newPeak) + 1.0);\n\n  return shifted * (newPeak / peak) * (1.0 - g) + newPeak * g;\n}\n\nfn toneMap(color: vec3<f32>) -> vec3<f32> {\n  let exposed = max(color * present.exposure, vec3<f32>(0.0));\n  var mapped = exposed;\n\n  if (present.toneMapping == 0u) {\n    mapped = toneMapAces(exposed);\n  } else if (present.toneMapping == 1u) {\n    mapped = toneMapAgx(exposed);\n  } else if (present.toneMapping == 2u) {\n    mapped = toneMapNeutral(exposed);\n  }\n\n  return clamp(mapped, vec3<f32>(0.0), vec3<f32>(1.0));\n}\n\nfn linearToSrgb(color: vec3<f32>) -> vec3<f32> {\n  let low = color * 12.92;\n  let high = 1.055 * pow(max(color, vec3<f32>(0.0)), vec3<f32>(1.0 / 2.4)) - 0.055;\n\n  return select(high, low, color <= vec3<f32>(0.0031308));\n}\n\nfn hash(value: u32) -> f32 {\n  var state = value * 747796405u + 2891336453u;\n  state = ((state >> ((state >> 28u) + 4u)) ^ state) * 277803737u;\n\n  return f32((state >> 22u) ^ state) * 2.3283064365386963e-10;\n}\n\n@fragment\nfn fragmentMain(@builtin(position) position: vec4<f32>) -> @location(0) vec4<f32> {\n  let pixel = vec2<u32>(position.xy);\n  let index = pixel.y * present.resolution.x + pixel.x;\n  let stored = accumulation[index];\n\n  // Nothing has been traced into this pixel yet: it stays see-through, so whatever is under the canvas shows.\n  if (stored.w <= 0.0) {\n    return vec4<f32>(0.0);\n  }\n\n  var color = select(stored.rgb / stored.w, vec3<f32>(0.0), stored.w <= 0.0);\n\n  if (present.denoised != 0u) {\n    color = denoised[index].rgb;\n  }\n  var alpha = 1.0;\n\n  if (present.transparent != 0u) {\n    let coverage = accumulation[present.resolution.x * present.resolution.y + index].x;\n    alpha = select(clamp(coverage / stored.w, 0.0, 1.0), 0.0, stored.w <= 0.0);\n    // The radiance is premultiplied by the coverage; the tone curve applies to the colour itself.\n    color = select(color / alpha, vec3<f32>(0.0), alpha <= 0.0);\n  }\n\n  let centred = position.xy / vec2<f32>(present.resolution) - 0.5;\n  let falloff = 1.0 - present.vignette * dot(centred, centred) * 2.0;\n  var output = linearToSrgb(toneMap(color * max(falloff, 0.0)));\n\n  if (present.grain > 0.0) {\n    let noise = hash(index * 9781u + present.frameIndex * 6151u) - 0.5;\n    output = clamp(output + noise * present.grain * 0.1, vec3<f32>(0.0), vec3<f32>(1.0));\n  }\n\n  return vec4<f32>(output * alpha, alpha);\n}\n";
+export declare const PRESENT_WGSL = "\nstruct Present {\n  resolution: vec2<u32>,\n  exposure: f32,\n  toneMapping: u32,\n  vignette: f32,\n  grain: f32,\n  frameIndex: u32,\n  // A transparent background: the canvas gets the coverage as alpha, premultiplied as it is configured.\n  transparent: u32,\n  // Whether the colour comes from the denoiser's output rather than straight from the accumulation.\n  denoised: u32,\n  // How much of AgX's Punchy look goes over its base curve.\n  contrast: f32,\n};\n\n@group(0) @binding(0) var<uniform> present: Present;\n@group(0) @binding(1) var<storage, read> accumulation: array<vec4<f32>>;\n@group(0) @binding(2) var<storage, read> denoised: array<vec4<f32>>;\n\n@vertex\nfn vertexMain(@builtin(vertex_index) index: u32) -> @builtin(position) vec4<f32> {\n  // One oversized triangle covers the viewport with no vertex buffer.\n  let x = f32(index / 2u) * 4.0 - 1.0;\n  let y = f32(index & 1u) * 4.0 - 1.0;\n\n  return vec4<f32>(x, y, 0.0, 1.0);\n}\n\nfn toneMapAces(color: vec3<f32>) -> vec3<f32> {\n  let toAces = mat3x3<f32>(\n    vec3<f32>(0.59719, 0.076, 0.0284),\n    vec3<f32>(0.35458, 0.90834, 0.13383),\n    vec3<f32>(0.04823, 0.01566, 0.83777));\n  let fromAces = mat3x3<f32>(\n    vec3<f32>(1.60475, -0.10208, -0.00327),\n    vec3<f32>(-0.53108, 1.10813, -0.07276),\n    vec3<f32>(-0.07367, -0.00605, 1.07602));\n  let v = toAces * (color / 0.6);\n\n  return fromAces * ((v * (v + 0.0245786) - 0.000090537) / (v * (0.983729 * v + 0.432951) + 0.238081));\n}\n\nfn toneMapAgx(color: vec3<f32>) -> vec3<f32> {\n  let toAgx = mat3x3<f32>(\n    vec3<f32>(0.6274, 0.0691, 0.0164),\n    vec3<f32>(0.3293, 0.9195, 0.088),\n    vec3<f32>(0.0433, 0.0113, 0.8956));\n  let inset = mat3x3<f32>(\n    vec3<f32>(0.856627153315983, 0.137318972929847, 0.11189821299995),\n    vec3<f32>(0.0951212405381588, 0.761241990602591, 0.0767994186031903),\n    vec3<f32>(0.0482516061458583, 0.101439036467562, 0.811302368396859));\n  let outset = mat3x3<f32>(\n    vec3<f32>(1.1271005818144368, -0.1413297634984383, -0.14132976349843826),\n    vec3<f32>(-0.11060664309660323, 1.157823702216272, -0.11060664309660294),\n    vec3<f32>(-0.016493938717834573, -0.016493938717834257, 1.2519364065950405));\n  let fromAgx = mat3x3<f32>(\n    vec3<f32>(1.6605, -0.1246, -0.0182),\n    vec3<f32>(-0.5876, 1.1329, -0.1006),\n    vec3<f32>(-0.0728, -0.0083, 1.1187));\n  let logged = inset * (toAgx * color);\n  let x = clamp((log2(max(logged, vec3<f32>(1e-10))) + 12.47393) / 16.499999, vec3<f32>(0.0), vec3<f32>(1.0));\n  let base = 15.5 * pow(x, vec3<f32>(6.0)) - 40.14 * pow(x, vec3<f32>(5.0)) + 31.96 * pow(x, vec3<f32>(4.0))\n    - 6.868 * pow(x, vec3<f32>(3.0)) + 0.4298 * x * x + 0.1191 * x - 0.00232;\n  // A look in the spirit of Blender's Punchy, a power of 1.35 and more saturation, but pivoted on middle grey: Punchy\n  // raises the power around zero, which takes middle grey from half the display down to a third and darkens the whole\n  // image. Here the highlights rise and the shadows fall while grey, which the automatic exposure aims at, stands.\n  let pivot = 0.49673;\n  let contrasted = pivot * pow(max(base, vec3<f32>(0.0)) / pivot, vec3<f32>(1.35));\n  let luma = dot(contrasted, vec3<f32>(0.2126, 0.7152, 0.0722));\n  let punchy = luma + 1.2 * (contrasted - luma);\n  let curved = mix(base, punchy, clamp(present.contrast, 0.0, 1.0));\n\n  return fromAgx * pow(max(outset * curved, vec3<f32>(0.0)), vec3<f32>(2.2));\n}\n\nfn toneMapNeutral(color: vec3<f32>) -> vec3<f32> {\n  let low = min(color.r, min(color.g, color.b));\n  let offset = select(0.04, low - 6.25 * low * low, low < 0.08);\n  let shifted = color - offset;\n  let peak = max(shifted.r, max(shifted.g, shifted.b));\n\n  if (peak < 0.76) {\n    return shifted;\n  }\n\n  let newPeak = 1.0 - 0.24 * 0.24 / (peak + 0.24 - 0.76);\n  let g = 1.0 - 1.0 / (0.15 * (peak - newPeak) + 1.0);\n\n  return shifted * (newPeak / peak) * (1.0 - g) + newPeak * g;\n}\n\nfn toneMap(color: vec3<f32>) -> vec3<f32> {\n  let exposed = max(color * present.exposure, vec3<f32>(0.0));\n  var mapped = exposed;\n\n  if (present.toneMapping == 0u) {\n    mapped = toneMapAces(exposed);\n  } else if (present.toneMapping == 1u) {\n    mapped = toneMapAgx(exposed);\n  } else if (present.toneMapping == 2u) {\n    mapped = toneMapNeutral(exposed);\n  }\n\n  return clamp(mapped, vec3<f32>(0.0), vec3<f32>(1.0));\n}\n\nfn linearToSrgb(color: vec3<f32>) -> vec3<f32> {\n  let low = color * 12.92;\n  let high = 1.055 * pow(max(color, vec3<f32>(0.0)), vec3<f32>(1.0 / 2.4)) - 0.055;\n\n  return select(high, low, color <= vec3<f32>(0.0031308));\n}\n\nfn hash(value: u32) -> f32 {\n  var state = value * 747796405u + 2891336453u;\n  state = ((state >> ((state >> 28u) + 4u)) ^ state) * 277803737u;\n\n  return f32((state >> 22u) ^ state) * 2.3283064365386963e-10;\n}\n\n@fragment\nfn fragmentMain(@builtin(position) position: vec4<f32>) -> @location(0) vec4<f32> {\n  let pixel = vec2<u32>(position.xy);\n  let index = pixel.y * present.resolution.x + pixel.x;\n  let stored = accumulation[index];\n\n  // Nothing has been traced into this pixel yet: it stays see-through, so whatever is under the canvas shows.\n  if (stored.w <= 0.0) {\n    return vec4<f32>(0.0);\n  }\n\n  var color = select(stored.rgb / stored.w, vec3<f32>(0.0), stored.w <= 0.0);\n\n  if (present.denoised != 0u) {\n    color = denoised[index].rgb;\n  }\n  var alpha = 1.0;\n\n  if (present.transparent != 0u) {\n    let coverage = accumulation[present.resolution.x * present.resolution.y + index].x;\n    alpha = select(clamp(coverage / stored.w, 0.0, 1.0), 0.0, stored.w <= 0.0);\n    // The radiance is premultiplied by the coverage; the tone curve applies to the colour itself.\n    color = select(color / alpha, vec3<f32>(0.0), alpha <= 0.0);\n  }\n\n  let centred = position.xy / vec2<f32>(present.resolution) - 0.5;\n  let falloff = 1.0 - present.vignette * dot(centred, centred) * 2.0;\n  var output = linearToSrgb(toneMap(color * max(falloff, 0.0)));\n\n  if (present.grain > 0.0) {\n    let noise = hash(index * 9781u + present.frameIndex * 6151u) - 0.5;\n    output = clamp(output + noise * present.grain * 0.1, vec3<f32>(0.0), vec3<f32>(1.0));\n  }\n\n  return vec4<f32>(output * alpha, alpha);\n}\n";
 //# sourceMappingURL=present.wgsl.d.ts.map

package/dist/wgsl/present.wgsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"present.wgsl.d.ts","sourceRoot":"","sources":["../../src/wgsl/present.wgsl.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,YAAY,63KAmJxB,CAAC"}
+{"version":3,"file":"present.wgsl.d.ts","sourceRoot":"","sources":["../../src/wgsl/present.wgsl.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,YAAY,ulMA6JxB,CAAC"}

package/dist/wgsl/present.wgsl.js

@@ -15,6 +15,8 @@ struct Present {
   transparent: u32,
   // Whether the colour comes from the denoiser's output rather than straight from the accumulation.
   denoised: u32,
+  // How much of AgX's Punchy look goes over its base curve.
+  contrast: f32,
 };
 
 @group(0) @binding(0) var<uniform> present: Present;
@@ -63,8 +65,16 @@ fn toneMapAgx(color: vec3<f32>) -> vec3<f32> {
     vec3<f32>(-0.0728, -0.0083, 1.1187));
   let logged = inset * (toAgx * color);
   let x = clamp((log2(max(logged, vec3<f32>(1e-10))) + 12.47393) / 16.499999, vec3<f32>(0.0), vec3<f32>(1.0));
-  let curved = 15.5 * pow(x, vec3<f32>(6.0)) - 40.14 * pow(x, vec3<f32>(5.0)) + 31.96 * pow(x, vec3<f32>(4.0))
+  let base = 15.5 * pow(x, vec3<f32>(6.0)) - 40.14 * pow(x, vec3<f32>(5.0)) + 31.96 * pow(x, vec3<f32>(4.0))
     - 6.868 * pow(x, vec3<f32>(3.0)) + 0.4298 * x * x + 0.1191 * x - 0.00232;
+  // A look in the spirit of Blender's Punchy, a power of 1.35 and more saturation, but pivoted on middle grey: Punchy
+  // raises the power around zero, which takes middle grey from half the display down to a third and darkens the whole
+  // image. Here the highlights rise and the shadows fall while grey, which the automatic exposure aims at, stands.
+  let pivot = 0.49673;
+  let contrasted = pivot * pow(max(base, vec3<f32>(0.0)) / pivot, vec3<f32>(1.35));
+  let luma = dot(contrasted, vec3<f32>(0.2126, 0.7152, 0.0722));
+  let punchy = luma + 1.2 * (contrasted - luma);
+  let curved = mix(base, punchy, clamp(present.contrast, 0.0, 1.0));
 
   return fromAgx * pow(max(outset * curved, vec3<f32>(0.0)), vec3<f32>(2.2));
 }

package/dist/wgsl/present.wgsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"present.wgsl.js","sourceRoot":"","sources":["../../src/wgsl/present.wgsl.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmJtC,CAAC"}
+{"version":3,"file":"present.wgsl.js","sourceRoot":"","sources":["../../src/wgsl/present.wgsl.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6JtC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinypoly/gpu-renderer",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "WebGPU path tracer for Three.js scenes: BVH traversal, progressive accumulation and tone mapping in WGSL compute shaders.",
   "keywords": [
     "three",
@@ -38,6 +38,7 @@
     "!dist/**/*.test.*",
     "src",
     "!src/**/*.test.ts",
+    "weights",
     "ARCHITECTURE.md"
   ],
   "engines": {
@@ -45,7 +46,8 @@
   },
   "dependencies": {
     "@tinypoly/cpu-renderer": "^0.3.1",
-    "naga-wasm": "30.2.0"
+    "naga-wasm": "30.2.0",
+    "oidn-webgpu": "0.6.0"
   },
   "peerDependencies": {
     "three": ">=0.185.0"

package/src/denoise.ts

@@ -1,10 +1,20 @@
 import { createShaderModule } from "./shaderModule.js";
 
+/**
+ * Which denoiser filters the image: `"oidn"`, Intel's Open Image Denoise, a neural network that keeps texture and fine
+ * detail, or `"svgf"`, the edge-aware wavelet filter, faster and with the controls below.
+ */
+export type DenoiserAlgorithm = "oidn" | "svgf";
+
 /** How the denoiser filters. Every field is optional where it is taken, and falls back to `DEFAULT_DENOISER`. */
 export interface DenoiserSettings {
+  /** The denoiser that runs; OIDN falls back to SVGF where its network cannot load. */
+  algorithm: DenoiserAlgorithm;
+  /** Where OIDN's weights are fetched from; empty takes the ones shipped with the package. */
+  oidnWeights: string;
   /** How much of the filtered image replaces the traced one, from 0 (none) to 1. */
   strength: number;
-  /** Wavelet passes, 1 to 5: how far the filter reaches, from 2 to 62 pixels. */
+  /** SVGF only from here: wavelet passes, 1 to 5, how far the filter reaches, from 2 to 62 pixels. */
   passes: number;
   /**
    * How large a luminance difference between two pixels still counts as noise, in standard deviations of the pixel's
@@ -28,6 +38,8 @@ export interface DenoiserSettings {
 }
 
 export const DEFAULT_DENOISER: Readonly<DenoiserSettings> = Object.freeze({
+  algorithm: "oidn",
+  oidnWeights: "",
   strength: 1,
   passes: 3,
   edge: 2,
@@ -42,6 +54,8 @@ export function mergeDenoiser(base: DenoiserSettings, input: Partial<DenoiserSet
   const merged = { ...base, ...Object.fromEntries(Object.entries(input).filter(([, value]) => value !== undefined)) };
 
   return {
+    algorithm: merged.algorithm === "svgf" ? "svgf" : "oidn",
+    oidnWeights: typeof merged.oidnWeights === "string" ? merged.oidnWeights : "",
     strength: Math.min(1, Math.max(0, Number(merged.strength) || 0)),
     passes: Math.min(5, Math.max(1, Math.round(Number(merged.passes) || 1))),
     edge: Math.max(0.01, Number(merged.edge) || DEFAULT_DENOISER.edge),

package/src/device.ts

@@ -63,10 +63,19 @@ export async function requestRenderDevice(options: RenderDeviceOptions = {}): Pr
   if (!adapter)
     throw new Error("GPU renderer: no WebGPU adapter was available.");
 
+  // Half floats and the adapter's widest workgroups are what the OIDN denoiser runs fastest with; the path tracer
+  // needs neither, and an adapter without them still gets a device.
+  const requiredFeatures: GPUFeatureName[] = adapter.features.has("shader-f16") ? ["shader-f16"] : [];
+
   const device = await adapter.requestDevice({
+    requiredFeatures,
     requiredLimits: {
       maxStorageBufferBindingSize: adapter.limits.maxStorageBufferBindingSize,
       maxBufferSize: adapter.limits.maxBufferSize,
+      maxComputeWorkgroupStorageSize: adapter.limits.maxComputeWorkgroupStorageSize,
+      maxComputeWorkgroupsPerDimension: adapter.limits.maxComputeWorkgroupsPerDimension,
+      maxComputeWorkgroupSizeX: adapter.limits.maxComputeWorkgroupSizeX,
+      maxComputeInvocationsPerWorkgroup: adapter.limits.maxComputeInvocationsPerWorkgroup,
     },
   });
 

package/src/frameLayout.ts

@@ -35,6 +35,9 @@ export const FRAME_LAYOUT = layoutStruct("Frame", [
   { name: "localLightCount", type: "u32", doc: "How many leading lights sit in the scene, which the light tree picks." },
   { name: "localLightPick", type: "f32", doc: "The chance of picking one of them, the last one's cumulative probability." },
   { name: "lightTree", type: "u32", doc: "Where the light tree's nodes start in the texture buffer; zero picks by power alone." },
+  { name: "portals", type: "u32", doc: "Where the tree of the windows the sky is sampled through starts in the texture buffer." },
+  { name: "portalCount", type: "u32", doc: "How many window triangles there are; zero samples the sky by its brightness alone." },
+  { name: "portalList", type: "u32", doc: "Where the windows of that tree's leaves are listed in the texture buffer." },
   { name: "lightList", type: "u32", doc: "Where the lights of the tree's leaves are listed in the texture buffer." },
   { name: "lightLeaves", type: "u32", doc: "Where the leaf of every local light starts in the texture buffer." },
   { name: "clampIndirect", type: "f32", doc: "Maximum luminance one indirect contribution may add; zero leaves it." },
@@ -55,7 +58,7 @@ export const FRAME_LAYOUT = layoutStruct("Frame", [
   { name: "skyProgram", type: "u32", doc: "A procedural sky's foreground program, or NO_PROGRAM." },
   { name: "skyData", type: "u32" },
   { name: "skyBackground", type: "u32", doc: "Whether a procedural sky paints the background (1) or leaves it black (0)." },
-  { name: "skyIntensity", type: "f32", doc: "The strength a procedural sky lights with, which its background ignores." },
+  { name: "skyIntensity", type: "f32", doc: "The strength a procedural sky lights with, and shows with as the background." },
   { name: "pixelCount", type: "u32", doc: "Where the alpha half of the accumulation buffer starts." },
   { name: "volumetricCount", type: "u32", doc: "Lights that scatter in the air, and where their records start." },
   { name: "volumetricData", type: "u32" },

package/src/imageResolve.ts

@@ -62,6 +62,7 @@ export interface ResolveSettings {
   exposure: number;
   toneMapping: RenderToneMapping;
   vignette: number;
+  contrast: number;
   transparent: boolean;
 }
 
@@ -92,6 +93,7 @@ export class ImageResolvePass {
     floats[4] = settings.vignette;
     integers[7] = settings.transparent ? 1 : 0;
     integers[8] = denoised ? 1 : 0;
+    floats[9] = settings.contrast;
     this.device.queue.writeBuffer(this.uniforms, 0, this.values);
 
     const bytes = width * height * 4;

package/src/index.ts

@@ -19,7 +19,8 @@ export type {
 export { attachCanvas } from "./canvas.js";
 
 export { DEFAULT_DENOISER } from "./denoise.js";
-export type { DenoiserSettings } from "./denoise.js";
+export { DEFAULT_OIDN_WEIGHTS } from "./oidnPass.js";
+export type { DenoiserAlgorithm, DenoiserSettings } from "./denoise.js";
 
 // The settings only this renderer reads, beside the CPU renderer's, and the defaults it renders with.
 export {

package/src/lensPass.ts

@@ -27,6 +27,8 @@ export interface LensEffects {
   glareAngle: number;
   /** A linear sRGB matrix, row by row, or `null` for a neutral white balance. */
   whiteBalance: number[] | null;
+  /** Whether the image is metered and exposed to middle grey before the display transform. */
+  autoExposure: boolean;
 }
 
 /** The lens effects these settings ask for, or `null` when they ask for none and the pass can be skipped. */
@@ -38,7 +40,9 @@ export function lensEffects(settings: GpuRenderSettings): LensEffects | null {
   const neutral = !Number.isFinite(camera.whiteBalance) || camera.whiteBalance === NEUTRAL_WHITE_BALANCE;
   const blades = Math.min(16, Math.max(3, Math.round(Number(glare.blades) || 6)));
 
-  if (intensity <= 0 && streaks <= 0 && aberration <= 0 && neutral) return null;
+  const autoExposure = camera.autoExposure === true;
+
+  if (intensity <= 0 && streaks <= 0 && aberration <= 0 && neutral && !autoExposure) return null;
 
   return {
     bloom: intensity,
@@ -50,6 +54,7 @@ export function lensEffects(settings: GpuRenderSettings): LensEffects | null {
     glareLength: Math.min(1, Math.max(0, Number(glare.length) || 0)),
     glareAngle: (Number(glare.rotation) || 0) * Math.PI / 180,
     whiteBalance: neutral ? null : whiteBalanceMatrix(camera.whiteBalance),
+    autoExposure,
   };
 }
 
@@ -93,6 +98,8 @@ export class LensPass {
   private readonly upsample: GPUComputePipeline;
   private readonly composite: GPUComputePipeline;
   private readonly streaks: GPUComputePipeline;
+  private readonly meter: GPUComputePipeline;
+  private readonly metered: GPUBuffer;
   /** One uniform buffer per dispatch, so every one of them keeps its own values until the queue runs it. */
   private readonly uniforms: GPUBuffer[] = [];
   private readonly values = new ArrayBuffer(UNIFORM_BYTES);
@@ -116,6 +123,7 @@ export class LensPass {
         { binding: 4, visibility: GPUShaderStage.COMPUTE, buffer: storage("storage") },
         { binding: 5, visibility: GPUShaderStage.COMPUTE, buffer: storage("storage") },
         { binding: 6, visibility: GPUShaderStage.COMPUTE, buffer: storage("storage") },
+        { binding: 7, visibility: GPUShaderStage.COMPUTE, buffer: storage("storage") },
       ],
     });
 
@@ -126,6 +134,8 @@ export class LensPass {
     this.upsample = pipeline("upsample");
     this.composite = pipeline("composite");
     this.streaks = pipeline("streaks");
+    this.meter = pipeline("meter");
+    this.metered = device.createBuffer({ label: "lens meter", size: 16, usage: GPUBufferUsage.STORAGE });
   }
 
   /** The graded image of the last `encode`, one vec4 of linear colour per pixel. */
@@ -201,6 +211,7 @@ export class LensPass {
       integers[32] = streak.width;
       integers[33] = streak.height;
       floats[34] = effects.glareAngle;
+      floats[35] = effects.autoExposure ? 1 : 0;
       for (let row = 0; row < 3; row++) for (let column = 0; column < 3; column++)
         floats[20 + row * 4 + column] = white[row * 3 + column];
       fill();
@@ -222,6 +233,7 @@ export class LensPass {
           { binding: 4, resource: { buffer: this.up as GPUBuffer } },
           { binding: 5, resource: { buffer: this.graded as GPUBuffer } },
           { binding: 6, resource: { buffer: this.streaked as GPUBuffer } },
+          { binding: 7, resource: { buffer: this.metered } },
         ],
       }));
       pass.dispatchWorkgroups(Math.ceil(target.width / WORKGROUP), Math.ceil(target.height / WORKGROUP));
@@ -278,6 +290,9 @@ export class LensPass {
       }
     }
 
+    // The meter is one workgroup, whatever the size: dispatched as a single tile of the grid it reads.
+    if (effects.autoExposure) dispatch(this.meter, { width: 1, height: 1 }, () => {});
+
     dispatch(this.composite, { width, height }, () => {});
 
     return this.graded as GPUBuffer;
@@ -293,6 +308,7 @@ export class LensPass {
 
   destroy() {
     this.destroyBuffers();
+    this.metered.destroy();
     for (const buffer of this.uniforms) buffer.destroy();
     this.uniforms.length = 0;
   }