@woosh/meep-engine 3.11.3 → 3.12.0

package/src/shade/renderer/light/cluster/cull/shader_cull_lights_hzb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_cull_lights_hzb.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/light/cluster/cull/shader_cull_lights_hzb.js"],"names":[],"mappings":"AA0CA;;GAEG;AACH,oDAFU,MAAM,CAEyC;AA8DzD,mDAIG;8BAjG2B,kCAAkC"}
+{"version":3,"file":"shader_cull_lights_hzb.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/light/cluster/cull/shader_cull_lights_hzb.js"],"names":[],"mappings":"AA2GA,mDAIG;8BAjG2B,kCAAkC"}

package/src/shade/renderer/light/cluster/cull/shader_cull_lights_hzb.js

@@ -1,112 +1,112 @@
-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_query_depth_from_screen_space_bb
-} from "../../../shader/chunk/depth/chunk_query_depth_from_screen_space_bb.js";
-import { AABB3_STRUCT } from "../../../shader/chunk/geometry/aabb3/AABB3_STRUCT.js";
-import {
-    chunk_aabb3_project_perspective
-} from "../../../shader/chunk/geometry/aabb3/chunk_aabb3_project_perspective.js";
-import { chunk_point_light_to_aabb3 } from "../../../shader/chunk/light/cull/chunk_point_light_to_aabb3.js";
-import { chunk_spot_light_to_aabb3 } from "../../../shader/chunk/light/cull/chunk_spot_light_to_aabb3.js";
-import { CodeChunk } from "../../../shader/compiler/CodeChunk.js";
-import { ComputeShader } from "../../../shader/ComputeShader.js";
-import { ShaderResourceSetDescriptor } from "../../../shader/resource/ShaderResourceSetDescriptor.js";
-import { CLUSTER_LIGHT_TYPE, chunk_cluster_light_tuple } from "../CLUSTER_LIGHT_TYPE.js";
-
-const resources = new ShaderResourceSetDescriptor();
-
-const INPUT = WebGPUStruct.from({
-    count: u32,
-    data: WebGPUArray.u32,
-});
-
-const OUTPUT_STRUCT = WebGPUStruct.from({
-    offset: atomic_u32,
-    data: WebGPUArray.u32
-});
-
-resources.createGroup()
-    .addStorageBuffer("light_data", WebGPUArray.u32);
-
-resources.createGroup()
-    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-    .addTexture("texture_hzb")
-;
-
-resources.createGroup()
-    .addStorageBuffer("input", INPUT)
-    .addStorageBuffer("output", OUTPUT_STRUCT, true)
-
-/**
- * @type {number}
- */
-export const SHADER_CULL_LIGHTS_HZB_WORKGROUP_SIZE = 256;
-
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-@compute @workgroup_size(${SHADER_CULL_LIGHTS_HZB_WORKGROUP_SIZE}, 1, 1)
-fn main(
-    @builtin(global_invocation_id) global_id : vec3<u32>
-) {
-
-    let slot = global_id.x;
-
-    // the producer's atomic append counter is not clamped on overflow, so the stored count
-    // can exceed capacity — iterating the raw value would re-read the clamped last element
-    let light_count = min(input.count, arrayLength(&input.data));
-
-    if (slot >= light_count) {
-        return;
-    }
-
-    // resolve (id, type) tuple
-    let tuple = input.data[slot];
-    let light_index = cluster_light_tuple_id(tuple);
-    let light_type = cluster_light_tuple_type(tuple);
-
-    var world_bounds: ${AABB3_STRUCT.wgsl_ref};
-
-    if (light_type == ${CLUSTER_LIGHT_TYPE.Point}u) {
-        world_bounds = point_light_to_aabb3(&light_data, light_index);
-    } else if (light_type == ${CLUSTER_LIGHT_TYPE.Spot}u) {
-        world_bounds = spot_light_to_aabb3(&light_data, light_index);
-    } else {
-        // unknown type, skip
-        return;
-    }
-
-    var view_bounds: ${AABB3_STRUCT.wgsl_ref};
-
-    let valid_bounds = aabb3_project_perspective(&view_bounds, world_bounds, camera.view_projection_matrix);
-
-    if (
-        valid_bounds && query_depth_from_screen_space_bb(view_bounds, texture_hzb) < 0.0
-    ) {
-        // occluded by depth
-        return;
-    }
-
-    let destination = atomicAdd(&output.offset, 1u);
-
-    if (destination < arrayLength(&output.data)) {
-        output.data[destination] = tuple;
-    }
-}
-    `, [
-        chunk_cluster_light_tuple,
-        chunk_point_light_to_aabb3,
-        chunk_spot_light_to_aabb3,
-        chunk_aabb3_project_perspective,
-        chunk_query_depth_from_screen_space_bb,
-    ]
-)
-
-export const shader_cull_lights_hzb = ComputeShader.from({
-    label: "Cull Lights HZB",
-    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_query_depth_from_screen_space_bb
+} from "../../../shader/chunk/depth/chunk_query_depth_from_screen_space_bb.js";
+import { AABB3_STRUCT } from "../../../shader/chunk/geometry/aabb3/AABB3_STRUCT.js";
+import {
+    chunk_aabb3_project_perspective
+} from "../../../shader/chunk/geometry/aabb3/chunk_aabb3_project_perspective.js";
+import { chunk_point_light_to_aabb3 } from "../../../shader/chunk/light/cull/chunk_point_light_to_aabb3.js";
+import { chunk_spot_light_to_aabb3 } from "../../../shader/chunk/light/cull/chunk_spot_light_to_aabb3.js";
+import { CodeChunk } from "../../../shader/compiler/CodeChunk.js";
+import { ComputeShader } from "../../../shader/ComputeShader.js";
+import { ShaderResourceSetDescriptor } from "../../../shader/resource/ShaderResourceSetDescriptor.js";
+import { CLUSTER_LIGHT_TYPE, chunk_cluster_light_tuple } from "../CLUSTER_LIGHT_TYPE.js";
+
+const resources = new ShaderResourceSetDescriptor();
+
+const INPUT = WebGPUStruct.from({
+    count: u32,
+    data: WebGPUArray.u32,
+});
+
+const OUTPUT_STRUCT = WebGPUStruct.from({
+    offset: atomic_u32,
+    data: WebGPUArray.u32
+});
+
+resources.createGroup()
+    .addStorageBuffer("light_data", WebGPUArray.u32);
+
+resources.createGroup()
+    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
+    .addTexture("texture_hzb")
+;
+
+resources.createGroup()
+    .addStorageBuffer("input", INPUT)
+    .addStorageBuffer("output", OUTPUT_STRUCT, true)
+
+/**
+ * @type {number}
+ */
+const SHADER_CULL_LIGHTS_HZB_WORKGROUP_SIZE = 256;
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@compute @workgroup_size(${SHADER_CULL_LIGHTS_HZB_WORKGROUP_SIZE}, 1, 1)
+fn main(
+    @builtin(global_invocation_id) global_id : vec3<u32>
+) {
+
+    let slot = global_id.x;
+
+    // the producer's atomic append counter is not clamped on overflow, so the stored count
+    // can exceed capacity — iterating the raw value would re-read the clamped last element
+    let light_count = min(input.count, arrayLength(&input.data));
+
+    if (slot >= light_count) {
+        return;
+    }
+
+    // resolve (id, type) tuple
+    let tuple = input.data[slot];
+    let light_index = cluster_light_tuple_id(tuple);
+    let light_type = cluster_light_tuple_type(tuple);
+
+    var world_bounds: ${AABB3_STRUCT.wgsl_ref};
+
+    if (light_type == ${CLUSTER_LIGHT_TYPE.Point}u) {
+        world_bounds = point_light_to_aabb3(&light_data, light_index);
+    } else if (light_type == ${CLUSTER_LIGHT_TYPE.Spot}u) {
+        world_bounds = spot_light_to_aabb3(&light_data, light_index);
+    } else {
+        // unknown type, skip
+        return;
+    }
+
+    var view_bounds: ${AABB3_STRUCT.wgsl_ref};
+
+    let valid_bounds = aabb3_project_perspective(&view_bounds, world_bounds, camera.view_projection_matrix);
+
+    if (
+        valid_bounds && query_depth_from_screen_space_bb(view_bounds, texture_hzb) < 0.0
+    ) {
+        // occluded by depth
+        return;
+    }
+
+    let destination = atomicAdd(&output.offset, 1u);
+
+    if (destination < arrayLength(&output.data)) {
+        output.data[destination] = tuple;
+    }
+}
+    `, [
+        chunk_cluster_light_tuple,
+        chunk_point_light_to_aabb3,
+        chunk_spot_light_to_aabb3,
+        chunk_aabb3_project_perspective,
+        chunk_query_depth_from_screen_space_bb,
+    ]
+)
+
+export const shader_cull_lights_hzb = ComputeShader.from({
+    label: "Cull Lights HZB",
+    body,
+    resources
+});

package/src/shade/renderer/light/cluster/graph_assign_clsuters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_assign_clsuters.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/cluster/graph_assign_clsuters.js"],"names":[],"mappings":"AA4CA;;;;;;;;GAQG;AACH,iGAFY;IAAC,cAAc,EAAC,MAAM,CAAC;IAAC,YAAY,EAAC,MAAM,CAAC;IAAC,kBAAkB,EAAC,MAAM,CAAA;CAAC,CAyHlF"}
+{"version":3,"file":"graph_assign_clsuters.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/cluster/graph_assign_clsuters.js"],"names":[],"mappings":"AA2CA;;;;;;;;GAQG;AACH,iGAFY;IAAC,cAAc,EAAC,MAAM,CAAC;IAAC,YAAY,EAAC,MAAM,CAAC;IAAC,kBAAkB,EAAC,MAAM,CAAA;CAAC,CAuHlF"}

package/src/shade/renderer/light/cluster/graph_assign_clsuters.js

@@ -10,7 +10,6 @@ import { LIGHT_CLUSTER_METADATA } from "./LIGHT_CLUSTER_METADATA.js";
 import { LIGHT_CLUSTER_RESOLUTION_Z, LIGHT_CLUSTER_TILE_RESOLUTION } from "./LIGHT_CLUSTER_RESOLUTION.js";
 import {
     LIGHT_CLUSTER_ASSIGNMENT_PUSH_CONSTANTS,
-    LIGHT_CLUSTER_WORKGROUP_SIZE,
     shader_cluster_assign_lights
 } from "./shader_cluster_assign_lights.js";
 
@@ -117,14 +116,12 @@ export function graph_assign_clsuters({
         const cluster_data = resources.get(data.cluster_data);
         const cluster_parameters = resources.get(data.cluster_parameters);
 
-        shader_cluster_assign_lights.dispatch({
+        shader_cluster_assign_lights.dispatchThreads({
             encoder: context.encoder,
 
-
-            // these below must produce whole numbers
-            group_count_x: Math.ceil(cluster_count_x / LIGHT_CLUSTER_WORKGROUP_SIZE[0]),
-            group_count_y: Math.ceil(cluster_count_y / LIGHT_CLUSTER_WORKGROUP_SIZE[1]),
-            group_count_z: Math.ceil(LIGHT_CLUSTER_RESOLUTION_Z / LIGHT_CLUSTER_WORKGROUP_SIZE[2]),
+            thread_count_x: cluster_count_x,
+            thread_count_y: cluster_count_y,
+            thread_count_z: LIGHT_CLUSTER_RESOLUTION_Z,
 
             bindings: {
                 camera: camera.buffer,

package/src/shade/renderer/light/cluster/shader_cluster_assign_lights.d.ts

@@ -1,11 +1,5 @@
 export const LIGHT_CLUSTER_ASSIGNMENT_PUSH_CONSTANTS: WebGPUStruct;
 export const LIGHT_CLUSTER_LOOKUP_STRUCT: WebGPUArray;
-/**
- * Note the low count, this is because we use a lot of registers,
- * and most of the workgroups are likely to not get enough registers during allocation and end up idle (unallocated)
- * @type {number[]}
- */
-export const LIGHT_CLUSTER_WORKGROUP_SIZE: number[];
 export const shader_cluster_assign_lights: ComputeShader;
 import { WebGPUStruct } from "../../shader/type/WebGPUStruct.js";
 import { WebGPUArray } from "../../shader/type/WebGPUArray.js";

package/src/shade/renderer/light/cluster/shader_cluster_assign_lights.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_cluster_assign_lights.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/cluster/shader_cluster_assign_lights.js"],"names":[],"mappings":"AA+BA,mEAMG;AAmBH,sDAAoF;AAKpF;;;;GAIG;AACH,2CAFU,MAAM,EAAE,CAEoC;AAiItD,yDAIG;6BArM0B,mCAAmC;4BADpC,kCAAkC;8BAoBhC,+BAA+B"}
+{"version":3,"file":"shader_cluster_assign_lights.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/cluster/shader_cluster_assign_lights.js"],"names":[],"mappings":"AA+BA,mEAMG;AAmBH,sDAAoF;AA2IpF,yDAIG;6BArM0B,mCAAmC;4BADpC,kCAAkC;8BAoBhC,+BAA+B"}

package/src/shade/renderer/light/cluster/shader_cluster_assign_lights.js

@@ -64,7 +64,7 @@ resources.createGroup({ label: "output" })
  * and most of the workgroups are likely to not get enough registers during allocation and end up idle (unallocated)
  * @type {number[]}
  */
-export const LIGHT_CLUSTER_WORKGROUP_SIZE = [4, 4, 4];
+const LIGHT_CLUSTER_WORKGROUP_SIZE = [4, 4, 4];
 
 const body = CodeChunk.from(
 //language=WGSL