@woosh/meep-engine 3.12.0 → 3.13.0

package/src/shade/renderer/shadow/ray/staged/gen/shader_generate_rays.js

@@ -1,149 +1,152 @@
-import { atomic_u32, u32 } from "../../../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
-import { WebGPUArray } from "../../../../shader/type/WebGPUArray.js";
-import { WebGPUStruct } from "../../../../shader/type/WebGPUStruct.js";
-import { CAMERA_UNIFORM_STRUCT } from "../../../../camera/CAMERA_UNIFORM_STRUCT.js";
-import { chunk_is_background } from "../../../../shader/chunk/depth/chunk_is_background.js";
-import {
-    chunk_project_position_from_depth
-} from "../../../../shader/chunk/camera/chunk_project_position_from_depth.js";
-import { chunk_decode_g_buffer_normal } from "../../../../shader/chunk/geometry/normal/chunk_decode_g_buffer_normal.js";
-import { chunk_offset_ray } from "../../../../shader/chunk/geometry/ray/chunk_offset_ray.js";
-import { RAY_STRUCT } from "../../../../shader/chunk/geometry/ray/RAY_STRUCT.js";
-import { chunk_grid2d_to_index } from "../../../../shader/chunk/grid/chunk_grid2d_to_index.js";
-import {
-    chunk_directional_lights_iteration_mask
-} from "../../../../shader/chunk/light/io/chunk_directional_lights_iteration_mask.js";
-import {
-    chunk_sample_directional_light_record
-} from "../../../../shader/chunk/light/sample/chunk_sample_directional_light_record.js";
-import { chunk_spatio_temporal_noise_r2_64 } from "../../../../shader/chunk/noise/chunk_spatio_temporal_noise_r2_64.js";
-import { chunk_texel_coordinate_to_uv } from "../../../../shader/chunk/texture/chunk_texel_coordinate_to_uv.js";
-import { CodeChunk } from "../../../../shader/compiler/CodeChunk.js";
-import { ComputeShader } from "../../../../shader/ComputeShader.js";
-import { ShaderResourceSetDescriptor } from "../../../../shader/resource/ShaderResourceSetDescriptor.js";
-import { HILBERT_R2_INDEX_TEXTURE } from "../../../../texture/noise/HILBERT_R2_INDEX_TEXTURE.js";
-import { chunk_pack_ray } from "../chunk_pack_ray.js";
-
-export const PUSH_CONSTANTS = WebGPUStruct.from({
-    frame_index: u32
-});
-
-/**
- * How many f32's make up a single packed ray
- * @type {number}
- */
-export const PACKED_RAY_WORD_COUNT = 8;
-
-const STRUCT_OUTPUT = WebGPUStruct.from({
-    count: atomic_u32,
-    // rays are packed
-    rays: WebGPUArray.vec4f,
-});
-
-const resources = new ShaderResourceSetDescriptor();
-
-resources.createGroup()
-    .addStorageBuffer("light_data", WebGPUArray.u32);
-
-resources.createGroup()
-    .addTexture("texture_depth")
-    .addTexture("texture_normal", "uint")
-    .addTexture("texture_noise", "uint", "2d", false, HILBERT_R2_INDEX_TEXTURE)
-    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-    .addUniform("settings", PUSH_CONSTANTS)
-
-resources.createGroup()
-    .addStorageBuffer("output", STRUCT_OUTPUT, true);
-
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-@compute @workgroup_size(8,4,1)
-fn main(
-    @builtin(global_invocation_id) global_invocation_id: vec3<u32>,
-){
-    let pixel_position = global_invocation_id.xy;
-    let texture_size = textureDimensions(texture_depth);
-  
-    if(any(pixel_position >= texture_size)){
-        // outside of the viewport
-        return;
-    }
-        
-    let texel_depth = textureLoad(
-        texture_depth,
-        pixel_position,
-        0
-    ).r;
-        
-    if(is_background(texel_depth)){
-        return;
-    }
-    
-    let uv = texel_coordinate_to_uv( vec2<f32>(pixel_position), texture_size);
-            
-    let position_ws = project_position_from_depth(
-        uv,
-        texel_depth,
-        camera.view_projection_matrix_inverse 
-    );
-    
-    let g_buffer_sample_normal = textureLoad( texture_normal,
-        pixel_position,
-        0
-    );
-    
-    let geometric_normal = decode_g_buffer_normal( g_buffer_sample_normal.zw );
-    let shading_normal = decode_g_buffer_normal( g_buffer_sample_normal.xy );
-                
-    let jitter = spatio_temporal_noise_r2_64(pixel_position, settings.frame_index, texture_noise);
-
-    var ray_origin = offset_ray(position_ws, geometric_normal);
-
-    // Pick the first occupied directional light from the iteration
-    // mask (max 32 directionals enforced by GPULightCollection). One
-    // ray per pixel; multi-directional shadowing would multiply ray
-    // budget and require the trace pass to scale accordingly.
-    let directional_bits = directional_lights_iteration_mask(&light_data);
-    if (directional_bits == 0u) {
-        return;
-    }
-    let directional_index = countTrailingZeros(directional_bits);
-    let light_record = sample_directional_light_record(&light_data, directional_index, ray_origin, jitter);
-    
-    var _ray: ${RAY_STRUCT.wgsl_ref};
-    
-    _ray.origin = ray_origin;
-    _ray.direction = light_record.direction;
-    _ray.tmax = light_record.distance;
-    
-    if(dot(_ray.direction, shading_normal) <= 0){
-        // ray points backways
-        return;
-    }
-    
-    let texel_index = grid2d_to_index(pixel_position, texture_size.x);
-    
-    let output_index = atomicAdd(&output.count, 1);
-    
-    pack_ray(&output.rays, output_index, _ray, texel_index);
-}
-    `, [
-        chunk_decode_g_buffer_normal,
-        chunk_directional_lights_iteration_mask,
-        chunk_sample_directional_light_record,
-        chunk_spatio_temporal_noise_r2_64,
-        chunk_offset_ray,
-        chunk_texel_coordinate_to_uv,
-        chunk_project_position_from_depth,
-        chunk_is_background,
-        chunk_pack_ray,
-        chunk_grid2d_to_index,
-    ]
-);
-
-export const shader_generate_rays = ComputeShader.from({
-    label: "Generate Shadow Rays",
-    body,
-    resources,
+import { atomic_u32, u32 } from "../../../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
+import { WebGPUArray } from "../../../../shader/type/WebGPUArray.js";
+import { WebGPUStruct } from "../../../../shader/type/WebGPUStruct.js";
+import { CAMERA_UNIFORM_STRUCT } from "../../../../camera/CAMERA_UNIFORM_STRUCT.js";
+import { chunk_is_background } from "../../../../shader/chunk/depth/chunk_is_background.js";
+import {
+    chunk_project_position_from_depth
+} from "../../../../shader/chunk/camera/chunk_project_position_from_depth.js";
+import { chunk_decode_g_buffer_normal } from "../../../../shader/chunk/geometry/normal/chunk_decode_g_buffer_normal.js";
+import { chunk_offset_ray } from "../../../../shader/chunk/geometry/ray/chunk_offset_ray.js";
+import { RAY_STRUCT } from "../../../../shader/chunk/geometry/ray/RAY_STRUCT.js";
+import { chunk_grid2d_to_index } from "../../../../shader/chunk/grid/chunk_grid2d_to_index.js";
+import {
+    chunk_directional_lights_iteration_mask
+} from "../../../../shader/chunk/light/io/chunk_directional_lights_iteration_mask.js";
+import {
+    chunk_sample_directional_light_record
+} from "../../../../shader/chunk/light/sample/chunk_sample_directional_light_record.js";
+import { chunk_spatio_temporal_noise_r2_64 } from "../../../../shader/chunk/noise/chunk_spatio_temporal_noise_r2_64.js";
+import { chunk_texel_coordinate_to_uv } from "../../../../shader/chunk/texture/chunk_texel_coordinate_to_uv.js";
+import { CodeChunk } from "../../../../shader/compiler/CodeChunk.js";
+import { ComputeShader } from "../../../../shader/ComputeShader.js";
+import { ShaderResourceSetDescriptor } from "../../../../shader/resource/ShaderResourceSetDescriptor.js";
+import { HILBERT_R2_INDEX_TEXTURE } from "../../../../texture/noise/HILBERT_R2_INDEX_TEXTURE.js";
+import { chunk_pack_ray } from "../chunk_pack_ray.js";
+
+export const PUSH_CONSTANTS = WebGPUStruct.from({
+    frame_index: u32
+});
+
+/**
+ * How many f32's make up a single packed ray
+ * @type {number}
+ */
+export const PACKED_RAY_WORD_COUNT = 8;
+
+const STRUCT_OUTPUT = WebGPUStruct.from({
+    count: atomic_u32,
+    // rays are packed
+    rays: WebGPUArray.vec4f,
+});
+
+const resources = new ShaderResourceSetDescriptor();
+
+// per-dispatch, four bytes, read-only: immediate data rather than a uniform buffer — the struct was
+// already named PUSH_CONSTANTS. camera stays bound.
+resources.setImmediate("settings", PUSH_CONSTANTS);
+
+resources.createGroup()
+    .addStorageBuffer("light_data", WebGPUArray.u32);
+
+resources.createGroup()
+    .addTexture("texture_depth")
+    .addTexture("texture_normal", "uint")
+    .addTexture("texture_noise", "uint", "2d", false, HILBERT_R2_INDEX_TEXTURE)
+    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
+
+resources.createGroup()
+    .addStorageBuffer("output", STRUCT_OUTPUT, true);
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@compute @workgroup_size(8,4,1)
+fn main(
+    @builtin(global_invocation_id) global_invocation_id: vec3<u32>,
+){
+    let pixel_position = global_invocation_id.xy;
+    let texture_size = textureDimensions(texture_depth);
+  
+    if(any(pixel_position >= texture_size)){
+        // outside of the viewport
+        return;
+    }
+        
+    let texel_depth = textureLoad(
+        texture_depth,
+        pixel_position,
+        0
+    ).r;
+        
+    if(is_background(texel_depth)){
+        return;
+    }
+    
+    let uv = texel_coordinate_to_uv( vec2<f32>(pixel_position), texture_size);
+            
+    let position_ws = project_position_from_depth(
+        uv,
+        texel_depth,
+        camera.view_projection_matrix_inverse 
+    );
+    
+    let g_buffer_sample_normal = textureLoad( texture_normal,
+        pixel_position,
+        0
+    );
+    
+    let geometric_normal = decode_g_buffer_normal( g_buffer_sample_normal.zw );
+    let shading_normal = decode_g_buffer_normal( g_buffer_sample_normal.xy );
+                
+    let jitter = spatio_temporal_noise_r2_64(pixel_position, settings.frame_index, texture_noise);
+
+    var ray_origin = offset_ray(position_ws, geometric_normal);
+
+    // Pick the first occupied directional light from the iteration
+    // mask (max 32 directionals enforced by GPULightCollection). One
+    // ray per pixel; multi-directional shadowing would multiply ray
+    // budget and require the trace pass to scale accordingly.
+    let directional_bits = directional_lights_iteration_mask(&light_data);
+    if (directional_bits == 0u) {
+        return;
+    }
+    let directional_index = countTrailingZeros(directional_bits);
+    let light_record = sample_directional_light_record(&light_data, directional_index, ray_origin, jitter);
+    
+    var _ray: ${RAY_STRUCT.wgsl_ref};
+    
+    _ray.origin = ray_origin;
+    _ray.direction = light_record.direction;
+    _ray.tmax = light_record.distance;
+    
+    if(dot(_ray.direction, shading_normal) <= 0){
+        // ray points backways
+        return;
+    }
+    
+    let texel_index = grid2d_to_index(pixel_position, texture_size.x);
+    
+    let output_index = atomicAdd(&output.count, 1);
+    
+    pack_ray(&output.rays, output_index, _ray, texel_index);
+}
+    `, [
+        chunk_decode_g_buffer_normal,
+        chunk_directional_lights_iteration_mask,
+        chunk_sample_directional_light_record,
+        chunk_spatio_temporal_noise_r2_64,
+        chunk_offset_ray,
+        chunk_texel_coordinate_to_uv,
+        chunk_project_position_from_depth,
+        chunk_is_background,
+        chunk_pack_ray,
+        chunk_grid2d_to_index,
+    ]
+);
+
+export const shader_generate_rays = ComputeShader.from({
+    label: "Generate Shadow Rays",
+    body,
+    resources,
 })

package/src/shade/renderer/shadow/ray/staged/trace/graph_trace_rays.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_trace_rays.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shadow/ray/staged/trace/graph_trace_rays.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,sEAFa,MAAM,CA+ElB"}
+{"version":3,"file":"graph_trace_rays.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shadow/ray/staged/trace/graph_trace_rays.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,sEAFa,MAAM,CAiFlB"}

package/src/shade/renderer/shadow/ray/staged/trace/graph_trace_rays.js

@@ -54,8 +54,10 @@ export function graph_trace_rays({
             encoder: context.encoder,
             thread_count_x: resolution[0] * resolution[1],
             bindings: {
-                resolution_width: context.encoder.allocateTransientValueBuffer(u32, resolution[0]),
-                random_seed: context.encoder.allocateTransientValueBuffer(u32, seed),
+                settings: {
+                    resolution_width: resolution[0],
+                    random_seed: seed,
+                },
                 rays,
                 tlas: b_tlas,
                 blas_lookup: b_blas_metadata,

package/src/shade/renderer/shadow/ray/staged/trace/shader_trace_rays.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_trace_rays.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shadow/ray/staged/trace/shader_trace_rays.js"],"names":[],"mappings":"AAgFA,8CAIE;8BA1E4B,qCAAqC"}
+{"version":3,"file":"shader_trace_rays.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shadow/ray/staged/trace/shader_trace_rays.js"],"names":[],"mappings":"AA8FA,8CAIE;8BAxF4B,qCAAqC"}

package/src/shade/renderer/shadow/ray/staged/trace/shader_trace_rays.js

@@ -18,8 +18,24 @@ const RAYS_STRUCT = WebGPUStruct.from({
     data: WebGPUArray.vec4f
 })
 
+/**
+ * Per-dispatch, eight bytes, read-only.
+ *
+ * `resolution_width` and `random_seed` were two separate u32 uniforms, which meant two transient
+ * buffers, two staging copies and two bind group entries per frame. WGSL allows one immediate per
+ * entry point, so carrying them as immediate data means carrying them together.
+ *
+ * @type {WebGPUStruct}
+ */
+const TRACE_SETTINGS = WebGPUStruct.from({
+    resolution_width: u32,
+    random_seed: u32,
+}, 'TraceRaysSettings');
+
 const resources = new ShaderResourceSetDescriptor();
 
+resources.setImmediate("settings", TRACE_SETTINGS);
+
 sr_create_group_RTX(resources);
 
 // ray_shaded_query_occluded samples material alpha (including the view-Fresnel
@@ -30,8 +46,6 @@ resources.createGroup()
     .addTexture("textures", "unfilterable-float", "2d-array")
 
 resources.createGroup()
-    .addUniform("resolution_width", u32)
-    .addUniform("random_seed", u32)
     .addStorageBuffer("rays", RAYS_STRUCT)
     .addStorageTexture("output", "r32float", "2d", "write-only")
 
@@ -52,10 +66,10 @@ fn main(
     let id = unpack_ray(&rays.data, thread_id.x, &ray);
 
     // if we got here, the ray is occluded, and we need to write it out
-    let texel_position = index_to_grid2d(id, resolution_width);
+    let texel_position = index_to_grid2d(id, settings.resolution_width);
 
     // stochastic alpha test inside ray_shaded_query_occluded needs a PRNG
-    random_initialize(thread_id, vec3<u32>(random_seed));
+    random_initialize(thread_id, vec3<u32>(settings.random_seed));
 
     var result: u32 = 0u;
 

package/src/shade/renderer/shadow/sdf/cascade/CascadedSceneSDF.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CascadedSceneSDF.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shadow/sdf/cascade/CascadedSceneSDF.js"],"names":[],"mappings":"AAcA;IAqDI;;;OAGG;IACH,+BAmCC;IArFD;;;OAGG;IACH,QAFU,KAAK,CAE8B;IAa7C,iCAEC;IAED;;;OAGG;IACH,yBAFW,MAAM,QAqBhB;IA2CD;;;;OAIG;IACH,oBAHW,sBAAsB,gCA0DhC;IAED;;;;OAIG;IACH,WAHW,sBAAsB,gCAQhC;IAED;;;OAGG;IACH,kBAFW,YAAY,iBA4BtB;IAED,0BAQC;IAED;;;OAGG;IACH,oBAFW,YAAY,QAkEtB;IAED,gBAEC;;CACJ;sBArSqB,2CAA2C;kCAK/B,uCAAuC;uCAFlC,8CAA8C;6BANxD,4CAA4C"}
+{"version":3,"file":"CascadedSceneSDF.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shadow/sdf/cascade/CascadedSceneSDF.js"],"names":[],"mappings":"AAcA;IAqDI;;;OAGG;IACH,+BAmCC;IArFD;;;OAGG;IACH,QAFU,KAAK,CAE8B;IAa7C,iCAEC;IAED;;;OAGG;IACH,yBAFW,MAAM,QAqBhB;IA2CD;;;;OAIG;IACH,oBAHW,sBAAsB,gCAyDhC;IAED;;;;OAIG;IACH,WAHW,sBAAsB,gCAQhC;IAED;;;OAGG;IACH,kBAFW,YAAY,iBA4BtB;IAED,0BAQC;IAED;;;OAGG;IACH,oBAFW,YAAY,QAkEtB;IAED,gBAEC;;CACJ;sBApSqB,2CAA2C;kCAK/B,uCAAuC;uCAFlC,8CAA8C;6BANxD,4CAA4C"}

package/src/shade/renderer/shadow/sdf/cascade/CascadedSceneSDF.js

@@ -130,15 +130,14 @@ export class CascadedSceneSDF {
             throw new Error(`Unsupported format ${this.#format}`);
         }
 
-        const settings = command_ctx.allocateTransientValueBuffer(
-            shader.descriptor.resources.getResourceByName("settings").buffer_type,
-            {
-                world_bounds: {
-                    min: [bounds.x0, bounds.y0, bounds.z0],
-                    max: [bounds.x1, bounds.y1, bounds.z1],
-                }
+        // the f16 and f32 shaders declare the same settings struct, so the value is written the same
+        // way for either — reading the type back off whichever one was picked is no longer needed
+        const settings = {
+            world_bounds: {
+                min: [bounds.x0, bounds.y0, bounds.z0],
+                max: [bounds.x1, bounds.y1, bounds.z1],
             }
-        );
+        };
 
         const geometries = scene.geometries;
         /**

package/src/shade/renderer/shadow/sdf/cascade/shader_build_scene_sdf_f32.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_build_scene_sdf_f32.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shadow/sdf/cascade/shader_build_scene_sdf_f32.js"],"names":[],"mappings":"AAkBA,uDAIE;AASF,uDAIE;8BAjC4B,kCAAkC"}
+{"version":3,"file":"shader_build_scene_sdf_f32.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shadow/sdf/cascade/shader_build_scene_sdf_f32.js"],"names":[],"mappings":"AAoBA,uDAIE;AAWF,uDAIE;8BArC4B,kCAAkC"}

package/src/shade/renderer/shadow/sdf/cascade/shader_build_scene_sdf_f32.js

@@ -10,8 +10,10 @@ const PUSH_CONSTANTS = WebGPUStruct.from({
 });
 
 const resources_f32 = new ShaderResourceSetDescriptor();
+
+// per-dispatch, 32 bytes, read-only: immediate data rather than a uniform buffer
+resources_f32.setImmediate("settings", PUSH_CONSTANTS);
 resources_f32.createGroup()
-    .addUniform("settings", PUSH_CONSTANTS)
     .addStorageTexture("output_texture", "r32float", "3d");
 
 sr_create_group_RTX(resources_f32);
@@ -23,8 +25,10 @@ export const shader_build_scene_sdf_f32 = ComputeShader.from({
 })
 
 const resources_f16 = new ShaderResourceSetDescriptor();
+
+// per-dispatch, 32 bytes, read-only: immediate data rather than a uniform buffer
+resources_f16.setImmediate("settings", PUSH_CONSTANTS);
 resources_f16.createGroup()
-    .addUniform("settings", PUSH_CONSTANTS)
     .addStorageTexture("output_texture", "r16float", "3d");
 
 sr_create_group_RTX(resources_f16);

package/src/shade/renderer/shadow/sdf/cascade/shader_scene_sdf_debug_viz.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_scene_sdf_debug_viz.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shadow/sdf/cascade/shader_scene_sdf_debug_viz.js"],"names":[],"mappings":"AAsHA,qDASG;4BA9GyB,gCAAgC"}
+{"version":3,"file":"shader_scene_sdf_debug_viz.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shadow/sdf/cascade/shader_scene_sdf_debug_viz.js"],"names":[],"mappings":"AAwHA,qDASG;4BAhHyB,gCAAgC"}