@woosh/meep-engine 3.11.3 → 3.12.0

package/src/shade/renderer/restir/di/shader_restir_di_resolve.js

@@ -1,100 +1,99 @@
-import { u32 } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
-import { WebGPUArray } from "../../shader/type/WebGPUArray.js";
-import { chunk_rtxdi_unpack_reservoir } from "../reservoir/chunk_rtxdi_unpack_reservoir.js";
-import { RTXDI_PackedReservoir } from "../reservoir/RTXDI_PackedReservoir.js";
-import { CAMERA_UNIFORM_STRUCT } from "../../camera/CAMERA_UNIFORM_STRUCT.js";
-import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
-import { ComputeShader } from "../../shader/ComputeShader.js";
-import { ShaderResourceGroupDescriptor } from "../../shader/resource/ShaderResourceGroupDescriptor.js";
-import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
-import { sr_create_group_RTX } from "../../geometry/sr_create_group_RTX.js";
-import { VIEW_UNIFORM_STRUCT } from "../../view/VIEW_UNIFORM_STRUCT.js";
-import { chunk_restir_reconstruct_surface } from "./chunk_restir_reconstruct_surface.js";
-import { chunk_restir_reservoir_address } from "./chunk_restir_reservoir_address.js";
-import { chunk_restir_resolve } from "./chunk_restir_resolve.js";
-
-/**
- * ReSTIR DI — resolve pass (stage 2 of 2).
- *
- * Per pixel: reconstruct the surface, read the reservoir the resample pass wrote,
- * and resolve it to outgoing radiance — full RGB BRDF * W * visibility, with one
- * opaque shadow ray. Holds the 7-buffer ray-tracing group plus light_data + the
- * reservoir (9 storage buffers), within maxStorageBuffersPerShaderStage. The
- * candidate generation + temporal reuse (which need the cluster + the second
- * reservoir) live in the resample pass.
- *
- * @type {ComputeShader}
- */
-
-const resources = new ShaderResourceSetDescriptor();
-
-// G-buffer + radiance output + uniforms.
-resources.createGroup()
-    .addTexture("gBufferDepth")
-    .addTexture("gBufferPBR")
-    .addTexture("gBufferNormal", "uint")
-    .addTexture("gBufferAlbedo")
-    .addTexture("gBufferEmissive", "uint")
-    // Depth + HiZ pyramid for the hybrid screen-space hand-off trace.
-    .addTexture("tDepth")
-    .addTexture("tHZB")
-    .addStorageTexture("output", "rgba16float", "2d", "write-only")
-    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-    .addUniform("view", VIEW_UNIFORM_STRUCT)
-    .addUniform("use_screen_space_shadow", u32);
-
-// Local light tables (resolve re-evaluates the selected light; no clusters needed).
-const RESTIR_DI_RESOLVE_LIGHT_GROUP = new ShaderResourceGroupDescriptor();
-RESTIR_DI_RESOLVE_LIGHT_GROUP.label = "restir-di/resolve-lights";
-RESTIR_DI_RESOLVE_LIGHT_GROUP.addStorageBuffer("light_data", WebGPUArray.u32);
-resources.addGroup(RESTIR_DI_RESOLVE_LIGHT_GROUP);
-
-// Ray-tracing acceleration structure + geometry (opaque visibility ray).
-sr_create_group_RTX(resources);
-
-// The reservoir written by the resample pass (read-only here).
-const RESTIR_DI_RESOLVE_RESERVOIR_GROUP = new ShaderResourceGroupDescriptor();
-RESTIR_DI_RESOLVE_RESERVOIR_GROUP.label = "restir-di/resolve-reservoir";
-RESTIR_DI_RESOLVE_RESERVOIR_GROUP.addStorageBuffer("reservoir_current", WebGPUArray.from(RTXDI_PackedReservoir), false);
-resources.addGroup(RESTIR_DI_RESOLVE_RESERVOIR_GROUP);
-
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-@compute @workgroup_size(8, 8, 1)
-fn main(
-    @builtin(global_invocation_id) global_invocation_id: vec3<u32>,
-) {
-    let i_coord = global_invocation_id.xy;
-    let texture_size = textureDimensions(gBufferDepth);
-
-    if (!all(i_coord < texture_size)) {
-        return;
-    }
-
-    let surface = restir_reconstruct_surface(i_coord, texture_size);
-    if (!surface.is_valid) {
-        textureStore(output, i_coord, vec4<f32>(0.0, 0.0, 0.0, 0.0));
-        return;
-    }
-
-    let reservoir = rtxdi_unpack_reservoir(reservoir_current[restir_reservoir_address(i_coord, texture_size.x)]);
-
-    let radiance = restir_resolve(i_coord, reservoir, surface.geometry, surface.material, use_screen_space_shadow);
-
-    textureStore(output, i_coord, vec4<f32>(radiance, 1.0));
-}
-    `, [
-        chunk_restir_reconstruct_surface,
-        chunk_rtxdi_unpack_reservoir,
-        chunk_restir_resolve,
-        chunk_restir_reservoir_address,
-    ]
-);
-
-export const shader_restir_di_resolve = ComputeShader.from({
-    label: "ReSTIR DI Resolve",
-    resources,
-    body,
-    group_size: [8, 8, 1],
-});
+import { u32 } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
+import { WebGPUArray } from "../../shader/type/WebGPUArray.js";
+import { chunk_rtxdi_unpack_reservoir } from "../reservoir/chunk_rtxdi_unpack_reservoir.js";
+import { RTXDI_PackedReservoir } from "../reservoir/RTXDI_PackedReservoir.js";
+import { CAMERA_UNIFORM_STRUCT } from "../../camera/CAMERA_UNIFORM_STRUCT.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ComputeShader } from "../../shader/ComputeShader.js";
+import { ShaderResourceGroupDescriptor } from "../../shader/resource/ShaderResourceGroupDescriptor.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { sr_create_group_RTX } from "../../geometry/sr_create_group_RTX.js";
+import { VIEW_UNIFORM_STRUCT } from "../../view/VIEW_UNIFORM_STRUCT.js";
+import { chunk_restir_reconstruct_surface } from "./chunk_restir_reconstruct_surface.js";
+import { chunk_restir_reservoir_address } from "./chunk_restir_reservoir_address.js";
+import { chunk_restir_resolve } from "./chunk_restir_resolve.js";
+
+/**
+ * ReSTIR DI — resolve pass (stage 2 of 2).
+ *
+ * Per pixel: reconstruct the surface, read the reservoir the resample pass wrote,
+ * and resolve it to outgoing radiance — full RGB BRDF * W * visibility, with one
+ * opaque shadow ray. Holds the 7-buffer ray-tracing group plus light_data + the
+ * reservoir (9 storage buffers), within maxStorageBuffersPerShaderStage. The
+ * candidate generation + temporal reuse (which need the cluster + the second
+ * reservoir) live in the resample pass.
+ *
+ * @type {ComputeShader}
+ */
+
+const resources = new ShaderResourceSetDescriptor();
+
+// G-buffer + radiance output + uniforms.
+resources.createGroup()
+    .addTexture("gBufferDepth")
+    .addTexture("gBufferPBR")
+    .addTexture("gBufferNormal", "uint")
+    .addTexture("gBufferAlbedo")
+    .addTexture("gBufferEmissive", "uint")
+    // Depth + HiZ pyramid for the hybrid screen-space hand-off trace.
+    .addTexture("tDepth")
+    .addTexture("tHZB")
+    .addStorageTexture("output", "rgba16float", "2d", "write-only")
+    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
+    .addUniform("view", VIEW_UNIFORM_STRUCT)
+    .addUniform("use_screen_space_shadow", u32);
+
+// Local light tables (resolve re-evaluates the selected light; no clusters needed).
+const RESTIR_DI_RESOLVE_LIGHT_GROUP = new ShaderResourceGroupDescriptor();
+RESTIR_DI_RESOLVE_LIGHT_GROUP.label = "restir-di/resolve-lights";
+RESTIR_DI_RESOLVE_LIGHT_GROUP.addStorageBuffer("light_data", WebGPUArray.u32);
+resources.addGroup(RESTIR_DI_RESOLVE_LIGHT_GROUP);
+
+// Ray-tracing acceleration structure + geometry (opaque visibility ray).
+sr_create_group_RTX(resources);
+
+// The reservoir written by the resample pass (read-only here).
+const RESTIR_DI_RESOLVE_RESERVOIR_GROUP = new ShaderResourceGroupDescriptor();
+RESTIR_DI_RESOLVE_RESERVOIR_GROUP.label = "restir-di/resolve-reservoir";
+RESTIR_DI_RESOLVE_RESERVOIR_GROUP.addStorageBuffer("reservoir_current", WebGPUArray.from(RTXDI_PackedReservoir), false);
+resources.addGroup(RESTIR_DI_RESOLVE_RESERVOIR_GROUP);
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@compute @workgroup_size(8, 8, 1)
+fn main(
+    @builtin(global_invocation_id) global_invocation_id: vec3<u32>,
+) {
+    let i_coord = global_invocation_id.xy;
+    let texture_size = textureDimensions(gBufferDepth);
+
+    if (!all(i_coord < texture_size)) {
+        return;
+    }
+
+    let surface = restir_reconstruct_surface(i_coord, texture_size);
+    if (!surface.is_valid) {
+        textureStore(output, i_coord, vec4<f32>(0.0, 0.0, 0.0, 0.0));
+        return;
+    }
+
+    let reservoir = rtxdi_unpack_reservoir(reservoir_current[restir_reservoir_address(i_coord, texture_size.x)]);
+
+    let radiance = restir_resolve(i_coord, reservoir, surface.geometry, surface.material, use_screen_space_shadow);
+
+    textureStore(output, i_coord, vec4<f32>(radiance, 1.0));
+}
+    `, [
+        chunk_restir_reconstruct_surface,
+        chunk_rtxdi_unpack_reservoir,
+        chunk_restir_resolve,
+        chunk_restir_reservoir_address,
+    ]
+);
+
+export const shader_restir_di_resolve = ComputeShader.from({
+    label: "ReSTIR DI Resolve",
+    resources,
+    body,
+});

package/src/shade/renderer/restir/di/shader_restir_di_spatial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_restir_di_spatial.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/restir/di/shader_restir_di_spatial.js"],"names":[],"mappings":"AA+GA,qDAKG;8BA3G2B,+BAA+B"}
+{"version":3,"file":"shader_restir_di_spatial.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/restir/di/shader_restir_di_spatial.js"],"names":[],"mappings":"AA+GA,qDAIG;8BA1G2B,+BAA+B"}

package/src/shade/renderer/restir/di/shader_restir_di_spatial.js

@@ -1,117 +1,116 @@
-import { WebGPUArray } from "../../shader/type/WebGPUArray.js";
-import { chunk_rtxdi_pack_reservoir } from "../reservoir/chunk_rtxdi_pack_reservoir.js";
-import { chunk_rtxdi_unpack_reservoir } from "../reservoir/chunk_rtxdi_unpack_reservoir.js";
-import { RTXDI_PackedReservoir } from "../reservoir/RTXDI_PackedReservoir.js";
-import { CAMERA_UNIFORM_STRUCT } from "../../camera/CAMERA_UNIFORM_STRUCT.js";
-import { chunk_stbn_sample_vec2 } from "../../shader/chunk/noise/chunk_stbn_sample_vec2.js";
-import { chunk_random } from "../../shader/chunk/random/chunk_random.js";
-import { chunk_random_initialize } from "../../shader/chunk/random/chunk_random_initialize.js";
-import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
-import { ComputeShader } from "../../shader/ComputeShader.js";
-import { ShaderResourceGroupDescriptor } from "../../shader/resource/ShaderResourceGroupDescriptor.js";
-import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
-import { VIEW_UNIFORM_STRUCT } from "../../view/VIEW_UNIFORM_STRUCT.js";
-import { chunk_restir_reconstruct_surface } from "./chunk_restir_reconstruct_surface.js";
-import { chunk_restir_reservoir_address } from "./chunk_restir_reservoir_address.js";
-import { chunk_restir_spatial_reuse } from "./chunk_restir_spatial_reuse.js";
-
-/**
- * ReSTIR DI — spatial pass (between resample and resolve).
- *
- * Reads the resample pass's reservoir for the pixel and its neighbours
- * (`reservoir_input`), combines them with geometric rejection, and writes the
- * spatiotemporal result to `reservoir_output` — which the resolve pass shades and
- * which becomes next frame's temporal history.
- *
- * Holds light_data + the two reservoir buffers = 3 storage buffers (no ray
- * tracing, no clusters), well within maxStorageBuffersPerShaderStage.
- *
- * @type {ComputeShader}
- */
-
-const resources = new ShaderResourceSetDescriptor();
-
-// G-buffer (surface reconstruct + neighbour rejection) + uniforms.
-resources.createGroup()
-    .addTexture("gBufferDepth")
-    .addTexture("gBufferPBR")
-    .addTexture("gBufferNormal", "uint")
-    .addTexture("gBufferAlbedo")
-    .addTexture("gBufferEmissive", "uint")
-    .addTexture("tSTBN_vec2", "unfilterable-float", "3d")
-    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-    .addUniform("view", VIEW_UNIFORM_STRUCT);
-
-// Local light tables (recompute neighbour target functions; no clusters needed).
-const RESTIR_DI_SPATIAL_LIGHT_GROUP = new ShaderResourceGroupDescriptor();
-RESTIR_DI_SPATIAL_LIGHT_GROUP.label = "restir-di/spatial-lights";
-RESTIR_DI_SPATIAL_LIGHT_GROUP.addStorageBuffer("light_data", WebGPUArray.u32);
-resources.addGroup(RESTIR_DI_SPATIAL_LIGHT_GROUP);
-
-// Input = resample output (read, incl. neighbours), output = spatiotemporal final.
-const RESTIR_DI_SPATIAL_RESERVOIR_GROUP = new ShaderResourceGroupDescriptor();
-RESTIR_DI_SPATIAL_RESERVOIR_GROUP.label = "restir-di/spatial-reservoirs";
-RESTIR_DI_SPATIAL_RESERVOIR_GROUP
-    .addStorageBuffer("reservoir_input", WebGPUArray.from(RTXDI_PackedReservoir), false)
-    .addStorageBuffer("reservoir_output", WebGPUArray.from(RTXDI_PackedReservoir), true);
-resources.addGroup(RESTIR_DI_SPATIAL_RESERVOIR_GROUP);
-
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-@compute @workgroup_size(8, 8, 1)
-fn main(
-    @builtin(global_invocation_id) global_invocation_id: vec3<u32>,
-) {
-    let i_coord = global_invocation_id.xy;
-    let texture_size = textureDimensions(gBufferDepth);
-
-    if (!all(i_coord < texture_size)) {
-        return;
-    }
-
-    // Distinct seed from the resample pass so the tap rotation decorrelates.
-    random_initialize(vec3<u32>(i_coord, view.frame_index), vec3<u32>(0x68E31DA4u, 0xB5297A4Du, 0x1B56C4E9u));
-
-    let address = restir_reservoir_address(i_coord, texture_size.x);
-    let self_reservoir = rtxdi_unpack_reservoir(reservoir_input[address]);
-
-    var result = self_reservoir;
-
-    let surface = restir_reconstruct_surface(i_coord, texture_size);
-    if (surface.is_valid) {
-        // Blue-noise rotation for the neighbour tap pattern. Offset the STBN
-        // temporal slice so it decorrelates from the resample pass's STBN use.
-        let rotation_random = stbn_sample_vec2(vec3<u32>(i_coord, view.frame_index + 32u)).x;
-
-        result = restir_spatial_reuse(
-            self_reservoir,
-            surface.geometry,
-            surface.material,
-            surface.view_depth,
-            i_coord,
-            texture_size,
-            rotation_random,
-        );
-    }
-
-    reservoir_output[address] = rtxdi_pack_reservoir(result);
-}
-    `, [
-        chunk_restir_reconstruct_surface,
-        chunk_restir_spatial_reuse,
-        chunk_stbn_sample_vec2,
-        chunk_rtxdi_unpack_reservoir,
-        chunk_rtxdi_pack_reservoir,
-        chunk_restir_reservoir_address,
-        chunk_random,
-        chunk_random_initialize,
-    ]
-);
-
-export const shader_restir_di_spatial = ComputeShader.from({
-    label: "ReSTIR DI Spatial",
-    resources,
-    body,
-    group_size: [8, 8, 1],
-});
+import { WebGPUArray } from "../../shader/type/WebGPUArray.js";
+import { chunk_rtxdi_pack_reservoir } from "../reservoir/chunk_rtxdi_pack_reservoir.js";
+import { chunk_rtxdi_unpack_reservoir } from "../reservoir/chunk_rtxdi_unpack_reservoir.js";
+import { RTXDI_PackedReservoir } from "../reservoir/RTXDI_PackedReservoir.js";
+import { CAMERA_UNIFORM_STRUCT } from "../../camera/CAMERA_UNIFORM_STRUCT.js";
+import { chunk_stbn_sample_vec2 } from "../../shader/chunk/noise/chunk_stbn_sample_vec2.js";
+import { chunk_random } from "../../shader/chunk/random/chunk_random.js";
+import { chunk_random_initialize } from "../../shader/chunk/random/chunk_random_initialize.js";
+import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ComputeShader } from "../../shader/ComputeShader.js";
+import { ShaderResourceGroupDescriptor } from "../../shader/resource/ShaderResourceGroupDescriptor.js";
+import { ShaderResourceSetDescriptor } from "../../shader/resource/ShaderResourceSetDescriptor.js";
+import { VIEW_UNIFORM_STRUCT } from "../../view/VIEW_UNIFORM_STRUCT.js";
+import { chunk_restir_reconstruct_surface } from "./chunk_restir_reconstruct_surface.js";
+import { chunk_restir_reservoir_address } from "./chunk_restir_reservoir_address.js";
+import { chunk_restir_spatial_reuse } from "./chunk_restir_spatial_reuse.js";
+
+/**
+ * ReSTIR DI — spatial pass (between resample and resolve).
+ *
+ * Reads the resample pass's reservoir for the pixel and its neighbours
+ * (`reservoir_input`), combines them with geometric rejection, and writes the
+ * spatiotemporal result to `reservoir_output` — which the resolve pass shades and
+ * which becomes next frame's temporal history.
+ *
+ * Holds light_data + the two reservoir buffers = 3 storage buffers (no ray
+ * tracing, no clusters), well within maxStorageBuffersPerShaderStage.
+ *
+ * @type {ComputeShader}
+ */
+
+const resources = new ShaderResourceSetDescriptor();
+
+// G-buffer (surface reconstruct + neighbour rejection) + uniforms.
+resources.createGroup()
+    .addTexture("gBufferDepth")
+    .addTexture("gBufferPBR")
+    .addTexture("gBufferNormal", "uint")
+    .addTexture("gBufferAlbedo")
+    .addTexture("gBufferEmissive", "uint")
+    .addTexture("tSTBN_vec2", "unfilterable-float", "3d")
+    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
+    .addUniform("view", VIEW_UNIFORM_STRUCT);
+
+// Local light tables (recompute neighbour target functions; no clusters needed).
+const RESTIR_DI_SPATIAL_LIGHT_GROUP = new ShaderResourceGroupDescriptor();
+RESTIR_DI_SPATIAL_LIGHT_GROUP.label = "restir-di/spatial-lights";
+RESTIR_DI_SPATIAL_LIGHT_GROUP.addStorageBuffer("light_data", WebGPUArray.u32);
+resources.addGroup(RESTIR_DI_SPATIAL_LIGHT_GROUP);
+
+// Input = resample output (read, incl. neighbours), output = spatiotemporal final.
+const RESTIR_DI_SPATIAL_RESERVOIR_GROUP = new ShaderResourceGroupDescriptor();
+RESTIR_DI_SPATIAL_RESERVOIR_GROUP.label = "restir-di/spatial-reservoirs";
+RESTIR_DI_SPATIAL_RESERVOIR_GROUP
+    .addStorageBuffer("reservoir_input", WebGPUArray.from(RTXDI_PackedReservoir), false)
+    .addStorageBuffer("reservoir_output", WebGPUArray.from(RTXDI_PackedReservoir), true);
+resources.addGroup(RESTIR_DI_SPATIAL_RESERVOIR_GROUP);
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@compute @workgroup_size(8, 8, 1)
+fn main(
+    @builtin(global_invocation_id) global_invocation_id: vec3<u32>,
+) {
+    let i_coord = global_invocation_id.xy;
+    let texture_size = textureDimensions(gBufferDepth);
+
+    if (!all(i_coord < texture_size)) {
+        return;
+    }
+
+    // Distinct seed from the resample pass so the tap rotation decorrelates.
+    random_initialize(vec3<u32>(i_coord, view.frame_index), vec3<u32>(0x68E31DA4u, 0xB5297A4Du, 0x1B56C4E9u));
+
+    let address = restir_reservoir_address(i_coord, texture_size.x);
+    let self_reservoir = rtxdi_unpack_reservoir(reservoir_input[address]);
+
+    var result = self_reservoir;
+
+    let surface = restir_reconstruct_surface(i_coord, texture_size);
+    if (surface.is_valid) {
+        // Blue-noise rotation for the neighbour tap pattern. Offset the STBN
+        // temporal slice so it decorrelates from the resample pass's STBN use.
+        let rotation_random = stbn_sample_vec2(vec3<u32>(i_coord, view.frame_index + 32u)).x;
+
+        result = restir_spatial_reuse(
+            self_reservoir,
+            surface.geometry,
+            surface.material,
+            surface.view_depth,
+            i_coord,
+            texture_size,
+            rotation_random,
+        );
+    }
+
+    reservoir_output[address] = rtxdi_pack_reservoir(result);
+}
+    `, [
+        chunk_restir_reconstruct_surface,
+        chunk_restir_spatial_reuse,
+        chunk_stbn_sample_vec2,
+        chunk_rtxdi_unpack_reservoir,
+        chunk_rtxdi_pack_reservoir,
+        chunk_restir_reservoir_address,
+        chunk_random,
+        chunk_random_initialize,
+    ]
+);
+
+export const shader_restir_di_spatial = ComputeShader.from({
+    label: "ReSTIR DI Spatial",
+    resources,
+    body,
+});