@woosh/meep-engine 3.27.0 → 3.29.0

package/src/shade/renderer/rasterize/bucket/filter_materials_by_bucket.js

@@ -2,6 +2,7 @@ import { assert } from "../../../../core/assert.js";
 import { ShadeDrawMode } from "../../material/ShadeDrawMode.js";
 import { ShadeDrawSide } from "../../material/ShadeDrawSide.js";
 import { TransparencyMode } from "../../material/TransparencyMode.js";
+import { rasterization_material_bucket } from "../expand/bucket/chunk_rasterization_material_bucket.js";
 
 /**
  *
@@ -33,14 +34,20 @@ export function filter_materials_by_bucket(
 
     let material_count = 0;
 
+    // by bucket, not field by field: `Front` and `Back` are one bucket, so asking for either
+    // yields both, which is what puts them in a single pass
+    const bucket = rasterization_material_bucket(alpha_mode, draw_mode, draw_side);
+
     for (let i = 0; i < count; i++) {
         const material = materials[i];
 
-        if (
-            material.transparency_mode !== alpha_mode
-            || material.draw_mode !== draw_mode
-            || material.draw_side !== draw_side
-        ) {
+        const material_bucket = rasterization_material_bucket(
+            material.transparency_mode,
+            material.draw_mode,
+            material.draw_side
+        );
+
+        if (material_bucket !== bucket) {
             continue;
         }
 

package/src/shade/renderer/rasterize/bucket/prepare_meshlet_draw_commands_by_material.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare_meshlet_draw_commands_by_material.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/rasterize/bucket/prepare_meshlet_draw_commands_by_material.js"],"names":[],"mappings":"AA2BA;;;;;;;;;;;;;;;GAeG;AACH,uKAJa;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAC;IAAC,wBAAwB,EAAE,MAAM,CAAA;CAAC,CAwUnH"}
+{"version":3,"file":"prepare_meshlet_draw_commands_by_material.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/rasterize/bucket/prepare_meshlet_draw_commands_by_material.js"],"names":[],"mappings":"AA2BA;;;;;;;;;;;;;;;GAeG;AACH,uKAJa;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAC;IAAC,wBAAwB,EAAE,MAAM,CAAA;CAAC,CAgUnH"}

package/src/shade/renderer/rasterize/bucket/prepare_meshlet_draw_commands_by_material.js

@@ -2,7 +2,7 @@ import { assert } from "../../../../core/assert.js";
 import { ceilPowerOfTwo } from "../../../../core/binary/operations/ceilPowerOfTwo.js";
 import { round_up } from "../../../../core/math/round_up.js";
 import { BufferResourceDescriptor } from "../../../device/graph/BufferResourceDescriptor.js";
-import { u32, vec2u } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
+import { u32 } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
 import { STRUCT_UNINDEXED_DRAW_COMMAND } from "../../gpu_primitive/indirect/STRUCT_UNINDEXED_DRAW_COMMAND.js";
 import { cpu_build_hash_table } from "../../gpu_primitive/hash_table/cpu_build_hash_table.js";
 import { graph_prefix_scan_csdldf } from "../../gpu_primitive/prefix_sum/v1/graph_prefix_scan_csdldf.js";
@@ -22,7 +22,7 @@ import { shader_count_meshlets_by_material } from "./shader_count_meshlets_by_ma
 import {
     shader_make_meshlet_indirect_draw_commands_by_material
 } from "./shader_make_meshlet_indirect_draw_commands_by_material.js";
-import { PUSH_CONSTANTS, shader_read_out_bucket } from "./shader_read_out_bucket.js";
+import { shader_read_out_bucket } from "./shader_read_out_bucket.js";
 import { shader_sort_meshlets_by_material } from "./shader_sort_meshlets_by_material.js";
 
 /**
@@ -83,16 +83,11 @@ export function graph_prepare_meshlet_draw_commands_by_material({
             0
         );
 
-        // TODO(chrome-153): transient uniform, not an immediate value — see the shader.
-        const u_settings = encoder.allocateTransientValueBuffer(PUSH_CONSTANTS, {
-            bucket_id,
-        });
-
         shader_read_out_bucket.dispatchIndirect({
             encoder,
             command,
             bindings: {
-                settings: u_settings,
+                settings: { bucket_id },
                 input: buckets_buffer,
                 output,
             }
@@ -165,15 +160,12 @@ export function graph_prepare_meshlet_draw_commands_by_material({
             const hzb = resources.get(data.texture_hzb);
             const command = resources.get(data.command);
 
-            // TODO(chrome-153): transient uniform, not an immediate value — see the shader.
-            const u_resolution = encoder.allocateTransientValueBuffer(vec2u, resolution);
-
             shader_hzb_meshlet_filter_1way_full.dispatchIndirect({
                 encoder,
                 command,
                 bindings: {
                     camera: camera_state,
-                    resolution: u_resolution,
+                    resolution,
                     scene_database: scene.scene_database_buffer,
                     meshlet_metadata: scene.geometries.meshlets.buffer_metadata,
                     texture_hzb: hzb.obtainView(),

package/src/shade/renderer/rasterize/bucket/rasterization_opaque_buckets.d.ts

@@ -0,0 +1,22 @@
+/**
+ * The opaque rasterization buckets a scene has anything in, once each.
+ *
+ * Every opaque path records one pass per bucket, and the pass is expensive — extract, expand to
+ * meshlets, select a virtual-geometry cut, one render pass. So what is iterated has to be the
+ * *buckets*, and iterating `ShadeDrawSide` is not that: `Front` and `Back` are one bucket, and a
+ * loop over the enum visits it twice and draws the scene's single-sided geometry twice.
+ *
+ * Which is why this exists rather than the three callers each writing the loop: the enum is the
+ * obvious thing to reach for and it is wrong, and it is wrong in a way that costs a whole pass and
+ * shows up in nothing but a frame time.
+ *
+ * @param {Set<number>} active_buckets bucket ids any material in the scene asks for
+ * @yields {{draw_mode: ShadeDrawMode, side: ShadeDrawSide, bucket_id: number}} `side` is the
+ *   bucket's representative, which is what {@link construct_primitive_state} wants
+ */
+export function rasterization_opaque_buckets(active_buckets: Set<number>): Generator<{
+    draw_mode: number;
+    side: number;
+    bucket_id: number;
+}, void, unknown>;
+//# sourceMappingURL=rasterization_opaque_buckets.d.ts.map

package/src/shade/renderer/rasterize/bucket/rasterization_opaque_buckets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rasterization_opaque_buckets.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/rasterize/bucket/rasterization_opaque_buckets.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;GAeG;AACH,6DAJW,IAAI,MAAM,CAAC;;;;kBAkBrB"}

package/src/shade/renderer/rasterize/bucket/rasterization_opaque_buckets.js

@@ -0,0 +1,36 @@
+import { ShadeDrawMode } from "../../material/ShadeDrawMode.js";
+import { TransparencyMode } from "../../material/TransparencyMode.js";
+import { rasterization_material_bucket } from "../expand/bucket/chunk_rasterization_material_bucket.js";
+import { RASTERIZATION_BUCKET_SIDES } from "./construct_primitive_state.js";
+
+/**
+ * The opaque rasterization buckets a scene has anything in, once each.
+ *
+ * Every opaque path records one pass per bucket, and the pass is expensive — extract, expand to
+ * meshlets, select a virtual-geometry cut, one render pass. So what is iterated has to be the
+ * *buckets*, and iterating `ShadeDrawSide` is not that: `Front` and `Back` are one bucket, and a
+ * loop over the enum visits it twice and draws the scene's single-sided geometry twice.
+ *
+ * Which is why this exists rather than the three callers each writing the loop: the enum is the
+ * obvious thing to reach for and it is wrong, and it is wrong in a way that costs a whole pass and
+ * shows up in nothing but a frame time.
+ *
+ * @param {Set<number>} active_buckets bucket ids any material in the scene asks for
+ * @yields {{draw_mode: ShadeDrawMode, side: ShadeDrawSide, bucket_id: number}} `side` is the
+ *   bucket's representative, which is what {@link construct_primitive_state} wants
+ */
+export function* rasterization_opaque_buckets(active_buckets) {
+    for (const draw_mode of Object.values(ShadeDrawMode)) {
+        for (const side of RASTERIZATION_BUCKET_SIDES) {
+
+            const bucket_id = rasterization_material_bucket(TransparencyMode.Opaque, draw_mode, side);
+
+            if (!active_buckets.has(bucket_id)) {
+                // no matching materials, skip
+                continue;
+            }
+
+            yield { draw_mode, side, bucket_id };
+        }
+    }
+}

package/src/shade/renderer/rasterize/bucket/shader_read_out_bucket.d.ts

@@ -1,5 +1,3 @@
-export const PUSH_CONSTANTS: WebGPUStruct;
 export const shader_read_out_bucket: ComputeShader;
-import { WebGPUStruct } from "../../shader/type/WebGPUStruct.js";
 import { ComputeShader } from "../../shader/ComputeShader.js";
 //# sourceMappingURL=shader_read_out_bucket.d.ts.map

package/src/shade/renderer/rasterize/bucket/shader_read_out_bucket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_read_out_bucket.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/rasterize/bucket/shader_read_out_bucket.js"],"names":[],"mappings":"AAcA,0CAEG;AAsCH,mDAIE;6BAzD2B,mCAAmC;8BAIlC,+BAA+B"}
+{"version":3,"file":"shader_read_out_bucket.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/rasterize/bucket/shader_read_out_bucket.js"],"names":[],"mappings":"AAqDA,mDAIE;8BApD4B,+BAA+B"}

package/src/shade/renderer/rasterize/bucket/shader_read_out_bucket.js

@@ -12,14 +12,13 @@ import {
 
 const resources = new ShaderResourceSetDescriptor();
 
-export const PUSH_CONSTANTS = WebGPUStruct.from({
+const PUSH_CONSTANTS = WebGPUStruct.from({
     bucket_id: u32,
 });
 
-// TODO(chrome-153): uniform, not immediate — Dawn 153 overwrites immediate data on
-//      dispatchWorkgroupsIndirect, so this reads 65535 and culls everything. Revert 7c9700b87.
-resources.createGroup()
-    .addUniform("settings", PUSH_CONSTANTS);
+// per-dispatch, four bytes, read-only: immediate data rather than a pooled buffer, a staging copy
+// and a bind group of its own
+resources.setImmediate("settings", PUSH_CONSTANTS);
 
 resources.createGroup()
     .addStorageBuffer("input", RASTERIZATION_BUCKET_SORT_OUTPUT_STRUCT_READ)

package/src/shade/renderer/rasterize/chunk_triangle_winding_is_reversed.d.ts

@@ -0,0 +1,15 @@
+/**
+ * The whole of what a vertex shader needs to know to emit a triangle the right way round, in one
+ * place — because there is more than one reason to reverse and they are not independent of each
+ * other.
+ *
+ * Feed the answer to `triangle_list_reverse_winding`. Nanite's `ReverseWindingOrder` is the same
+ * function for the same reason: a GPU-driven draw mixes instances that disagree about this, so it
+ * cannot be pipeline state, and every reason has to be combined before the corner is chosen.
+ *
+ * @see chunk_triangle_list_reverse_winding
+ * @type {CodeChunk}
+ */
+export const chunk_triangle_winding_is_reversed: CodeChunk;
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+//# sourceMappingURL=chunk_triangle_winding_is_reversed.d.ts.map

package/src/shade/renderer/rasterize/chunk_triangle_winding_is_reversed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk_triangle_winding_is_reversed.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/rasterize/chunk_triangle_winding_is_reversed.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;GAWG;AACH,iDAFU,SAAS,CAmBb;0BA/BoB,iCAAiC"}

package/src/shade/renderer/rasterize/chunk_triangle_winding_is_reversed.js

@@ -0,0 +1,35 @@
+import { chunk_material_draw_side } from "../material/chunk_material_draw_side.js";
+import { chunk_node3d_flags } from "../scene/chunk_node3d_flags.js";
+import { NODE3D_STRUCT } from "../scene/NODE3D_STRUCT.js";
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+
+/**
+ * The whole of what a vertex shader needs to know to emit a triangle the right way round, in one
+ * place — because there is more than one reason to reverse and they are not independent of each
+ * other.
+ *
+ * Feed the answer to `triangle_list_reverse_winding`. Nanite's `ReverseWindingOrder` is the same
+ * function for the same reason: a GPU-driven draw mixes instances that disagree about this, so it
+ * cannot be pipeline state, and every reason has to be combined before the corner is chosen.
+ *
+ * @see chunk_triangle_list_reverse_winding
+ * @type {CodeChunk}
+ */
+export const chunk_triangle_winding_is_reversed = CodeChunk.from(
+    //language=WGSL
+    `
+/**
+ * Whether this instance's triangles must be emitted back to front.
+ *
+ * Two reasons, and they cancel: the instance's transform reflects, or the material asks for the
+ * back face. A back-sided material on a mirrored instance is wound like a front-sided one on an
+ * ordinary instance, and draws with the same pipeline state as both.
+ */
+fn triangle_winding_is_reversed( node: ${NODE3D_STRUCT.wgsl_ref}, draw_side: u32 ) -> bool{
+    return node3d_global_is_mirrored(node) != material_draws_back_side(draw_side);
+}
+`, [
+        NODE3D_STRUCT.declaration_chunk,
+        chunk_node3d_flags,
+        chunk_material_draw_side,
+    ])

package/src/shade/renderer/rasterize/cull/hzb/shader_hzb_mesh_filter_2way.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_hzb_mesh_filter_2way.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/cull/hzb/shader_hzb_mesh_filter_2way.js"],"names":[],"mappings":"AA4GA,wDAIG;8BA/F2B,kCAAkC"}
+{"version":3,"file":"shader_hzb_mesh_filter_2way.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/cull/hzb/shader_hzb_mesh_filter_2way.js"],"names":[],"mappings":"AA8GA,wDAIG;8BAjG2B,kCAAkC"}

package/src/shade/renderer/rasterize/cull/hzb/shader_hzb_mesh_filter_2way.js

@@ -21,10 +21,12 @@ import { ShaderResourceSetDescriptor } from "../../../shader/resource/ShaderReso
 
 const resources = new ShaderResourceSetDescriptor();
 
-// TODO(chrome-153): uniform, not immediate — Dawn 153 overwrites immediate data on
-//      dispatchWorkgroupsIndirect, so this reads 65535 and culls everything. Revert 22893f0a7.
+// per-dispatch, four bytes, read-only: immediate data rather than a uniform buffer — the same
+// shape shader_read_out_bucket already uses. camera_previous stays a uniform: it is a scene buffer,
+// not a per-dispatch value.
+resources.setImmediate("bucket_index", U32_CONTAINER_STRUCT);
+
 resources.createGroup()
-    .addUniform("bucket_index", U32_CONTAINER_STRUCT)
     .addStorageBuffer("bucket_data", RASTERIZATION_BUCKET_SORT_OUTPUT_STRUCT_READ)
 
 resources.createGroup()

package/src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_hzb_meshlet_filter_1way.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way.js"],"names":[],"mappings":"AAyFA,2DAIG;8BA/E2B,kCAAkC"}
+{"version":3,"file":"shader_hzb_meshlet_filter_1way.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way.js"],"names":[],"mappings":"AAgGA,2DAIG;8BArF2B,kCAAkC"}

package/src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way.js

@@ -10,6 +10,7 @@ import { AABB3_STRUCT } from "../../../shader/chunk/geometry/aabb3/AABB3_STRUCT.
 import { chunk_aabb3_project } from "../../../shader/chunk/geometry/aabb3/chunk_aabb3_project.js";
 import { chunk_aabb3_project_perspective } from "../../../shader/chunk/geometry/aabb3/chunk_aabb3_project_perspective.js";
 import { chunk_array_to_aabb3 } from "../../../shader/chunk/geometry/aabb3/chunk_array_to_aabb3.js";
+import { chunk_grid3d_to_index } from "../../../shader/chunk/grid/chunk_grid3d_to_index.js";
 import { CodeChunk } from "../../../shader/compiler/CodeChunk.js";
 import { COMPUTE_SHADER_DEFAULT_GROUP_SIZE } from "../../../shader/COMPUTE_SHADER_DEFAULT_GROUP_SIZE.js";
 import { ComputeShader } from "../../../shader/ComputeShader.js";
@@ -38,10 +39,15 @@ const body = CodeChunk.from(
 // language=WGSL
     `
 @compute @workgroup_size(${COMPUTE_SHADER_DEFAULT_GROUP_SIZE})
-fn unpack(@builtin(global_invocation_id) global_id : vec3<u32>){
-    
-    let input_index = global_id.x;
-    
+fn unpack(
+    @builtin(workgroup_id) workgroup_id : vec3<u32>,
+    @builtin(num_workgroups) group_count : vec3<u32>,
+    @builtin(local_invocation_index) local_index : u32,
+){
+
+    // folded dispatch — see IndirectComputeCommandBuildPass
+    let input_index = grid3d_to_index(workgroup_id, group_count.xy) * ${COMPUTE_SHADER_DEFAULT_GROUP_SIZE}u + local_index;
+
     if(input_index >= input.count){
         return;
     }
@@ -80,6 +86,7 @@ fn unpack(@builtin(global_invocation_id) global_id : vec3<u32>){
 }`,
     [
         AABB3_STRUCT.declaration_chunk,
+        chunk_grid3d_to_index,
         chunk_array_to_aabb3,
         chunk_aabb3_project,
         chunk_aabb3_project_perspective,

package/src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way_full.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_hzb_meshlet_filter_1way_full.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way_full.js"],"names":[],"mappings":"AA6GA;;;GAGG;AACH,kDAFU,aAAa,CAMpB;8BAnG2B,kCAAkC"}
+{"version":3,"file":"shader_hzb_meshlet_filter_1way_full.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way_full.js"],"names":[],"mappings":"AA8GA;;;GAGG;AACH,kDAFU,aAAa,CAMpB;8BApG2B,kCAAkC"}

package/src/shade/renderer/rasterize/cull/hzb/shader_hzb_meshlet_filter_1way_full.js

@@ -23,11 +23,12 @@ import { MESHLET_COLLECTION_WRITE_STRUCT } from "../../MESHLET_COLLECTION_WRITE_
 
 const resources = new ShaderResourceSetDescriptor();
 
-// TODO(chrome-153): uniform, not immediate — Dawn 153 overwrites immediate data on
-//      dispatchWorkgroupsIndirect, so this reads 65535 and culls everything. Revert 22893f0a7.
+// per-dispatch, eight bytes, read-only: immediate data rather than a uniform buffer. camera stays
+// a uniform — it is a scene buffer, not a per-dispatch value.
+resources.setImmediate("resolution", vec2u);
+
 resources.createGroup()
     .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-    .addUniform("resolution", vec2u)
     .addStorageBuffer("scene_database", WebGPUArray.from(u32))
     .addStorageBuffer("meshlet_metadata", WebGPUArray.from(MESHLET_METADATA_STRUCT))
     .addTexture("texture_hzb")

package/src/shade/renderer/rasterize/expand/bucket/RASTERIZATION_BUCKET_LIMIT.d.ts

@@ -1,6 +1,15 @@
 export const RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE: number;
 export const RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE: number;
-export const RASTERIZATION_BUCKET_BIT_COUNT_DRAW_SIDE: number;
+/**
+ * One bit, not the two {@link ShadeDrawSide} would need. Only double-sided geometry needs a
+ * pipeline of its own — `cullMode: 'none'` has no winding equivalent. `Front` and `Back` share
+ * one: a back-sided material is a front-sided one drawn with its winding reversed, and the
+ * vertex shader does the reversing.
+ *
+ * @see rasterization_material_bucket
+ * @type {number}
+ */
+export const RASTERIZATION_BUCKET_BIT_COUNT_DOUBLE_SIDED: number;
 /**
  * Maximum number of rasterization buckets. This is a number of permutations of different alpha and draw modes.
  * See Northlight talk on "Alan Wake 2" meshlet shading.

package/src/shade/renderer/rasterize/expand/bucket/RASTERIZATION_BUCKET_LIMIT.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RASTERIZATION_BUCKET_LIMIT.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/expand/bucket/RASTERIZATION_BUCKET_LIMIT.js"],"names":[],"mappings":"AAmBA,+DAA0F;AAC1F,8DAAsF;AACtF,8DAAsF;AAEtF;;;;GAIG;AACH,yCAFU,MAAM,CAEmK"}
+{"version":3,"file":"RASTERIZATION_BUCKET_LIMIT.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/expand/bucket/RASTERIZATION_BUCKET_LIMIT.js"],"names":[],"mappings":"AAkBA,+DAA0F;AAC1F,8DAAsF;AAEtF;;;;;;;;GAQG;AACH,0DAFU,MAAM,CAE6C;AAE7D;;;;GAIG;AACH,yCAFU,MAAM,CAEsK"}

package/src/shade/renderer/rasterize/expand/bucket/RASTERIZATION_BUCKET_LIMIT.js

@@ -1,29 +1,38 @@
-import { assert } from "../../../../../core/assert.js";
-import { ShadeDrawMode } from "../../../material/ShadeDrawMode.js";
-import { ShadeDrawSide } from "../../../material/ShadeDrawSide.js";
-import { TransparencyMode } from "../../../material/TransparencyMode.js";
-
-/**
- *
- * @param {Object} e enum
- * @return {number} number of bits required to represent it
- */
-function enum_bit_count(e) {
-    const max = Math.max.apply(null, Object.values(e));
-
-    assert.isNonNegativeInteger(max, 'max');
-    assert.lessThanOrEqual(max, 5, "the bucket count is going to be absurd");
-
-    return 32 - Math.clz32(max);
-}
-
-export const RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE = enum_bit_count(TransparencyMode);
-export const RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE = enum_bit_count(ShadeDrawMode);
-export const RASTERIZATION_BUCKET_BIT_COUNT_DRAW_SIDE = enum_bit_count(ShadeDrawSide);
-
-/**
- * Maximum number of rasterization buckets. This is a number of permutations of different alpha and draw modes.
- * See Northlight talk on "Alan Wake 2" meshlet shading.
- * @type {number}
- */
-export const RASTERIZATION_BUCKET_LIMIT = (1 << (RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE + RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE + RASTERIZATION_BUCKET_BIT_COUNT_DRAW_SIDE));
+import { assert } from "../../../../../core/assert.js";
+import { ShadeDrawMode } from "../../../material/ShadeDrawMode.js";
+import { TransparencyMode } from "../../../material/TransparencyMode.js";
+
+/**
+ *
+ * @param {Object} e enum
+ * @return {number} number of bits required to represent it
+ */
+function enum_bit_count(e) {
+    const max = Math.max.apply(null, Object.values(e));
+
+    assert.isNonNegativeInteger(max, 'max');
+    assert.lessThanOrEqual(max, 5, "the bucket count is going to be absurd");
+
+    return 32 - Math.clz32(max);
+}
+
+export const RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE = enum_bit_count(TransparencyMode);
+export const RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE = enum_bit_count(ShadeDrawMode);
+
+/**
+ * One bit, not the two {@link ShadeDrawSide} would need. Only double-sided geometry needs a
+ * pipeline of its own — `cullMode: 'none'` has no winding equivalent. `Front` and `Back` share
+ * one: a back-sided material is a front-sided one drawn with its winding reversed, and the
+ * vertex shader does the reversing.
+ *
+ * @see rasterization_material_bucket
+ * @type {number}
+ */
+export const RASTERIZATION_BUCKET_BIT_COUNT_DOUBLE_SIDED = 1;
+
+/**
+ * Maximum number of rasterization buckets. This is a number of permutations of different alpha and draw modes.
+ * See Northlight talk on "Alan Wake 2" meshlet shading.
+ * @type {number}
+ */
+export const RASTERIZATION_BUCKET_LIMIT = (1 << (RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE + RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE + RASTERIZATION_BUCKET_BIT_COUNT_DOUBLE_SIDED));

package/src/shade/renderer/rasterize/expand/bucket/chunk_rasterization_material_bucket.d.ts

@@ -7,6 +7,11 @@
  */
 export function rasterization_material_bucket(alpha_mode: number | TransparencyMode, draw_mode: number | ShadeDrawMode, side: number | ShadeDrawSide): number;
 /**
+ * A bucket is a pipeline state, and the third field is the only thing a {@link ShadeDrawSide}
+ * still says about one: whether it culls at all. `Front` and `Back` land in the same bucket —
+ * a back-sided material is a front-sided one whose winding the vertex shader reverses — so a
+ * scene that mixes them draws in one pass, through one expansion chain.
+ *
  * @see TransparencyMode
  * @see ShadeDrawMode
  * @see rasterization_material_bucket

package/src/shade/renderer/rasterize/expand/bucket/chunk_rasterization_material_bucket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_rasterization_material_bucket.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/expand/bucket/chunk_rasterization_material_bucket.js"],"names":[],"mappings":"AAuCA;;;;;;GAMG;AACH,0DALW,MAAM,GAAC,gBAAgB,aACvB,MAAM,GAAC,aAAa,QACpB,MAAM,GAAC,aAAa,GACnB,MAAM,CAUjB;AAhCD;;;;;GAKG;AACH,kDAFU,SAAS,CAWjB;iCAlC+B,uCAAuC;8BAF1C,oCAAoC;8BACpC,oCAAoC;0BAExC,uCAAuC"}
+{"version":3,"file":"chunk_rasterization_material_bucket.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/rasterize/expand/bucket/chunk_rasterization_material_bucket.js"],"names":[],"mappings":"AA6CA;;;;;;GAMG;AACH,0DALW,MAAM,GAAC,gBAAgB,aACvB,MAAM,GAAC,aAAa,QACpB,MAAM,GAAC,aAAa,GACnB,MAAM,CAYjB;AAzCD;;;;;;;;;;GAUG;AACH,kDAFU,SAAS,CAajB;iCAxC+B,uCAAuC;8BAF1C,oCAAoC;8BACpC,oCAAoC;0BAExC,uCAAuC"}

package/src/shade/renderer/rasterize/expand/bucket/chunk_rasterization_material_bucket.js

@@ -1,55 +1,63 @@
-import { assert } from "../../../../../core/assert.js";
-import { ShadeDrawMode } from "../../../material/ShadeDrawMode.js";
-import { ShadeDrawSide } from "../../../material/ShadeDrawSide.js";
-import { TransparencyMode } from "../../../material/TransparencyMode.js";
-import { CodeChunk } from "../../../shader/compiler/CodeChunk.js";
-import {
-    RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE,
-    RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE,
-    RASTERIZATION_BUCKET_BIT_COUNT_DRAW_SIDE
-} from "./RASTERIZATION_BUCKET_LIMIT.js";
-
-// A field of N bits is masked with (1 << N) - 1, not N + 1 (the two coincide only at N == 2,
-// which is the value all three enums happen to have today).
-const mask_alpha = (1 << RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE) - 1;
-const shift_alpha = 0;
-
-const mask_primitive = (1 << RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE) - 1;
-const shift_primitive = shift_alpha + RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE;
-
-const mask_side = (1 << RASTERIZATION_BUCKET_BIT_COUNT_DRAW_SIDE) - 1;
-const shift_side = shift_primitive + RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE;
-
-/**
- * @see TransparencyMode
- * @see ShadeDrawMode
- * @see rasterization_material_bucket
- * @type {CodeChunk}
- */
-export const chunk_rasterization_material_bucket = CodeChunk.from(
-    //language=WGSL
-    `
-fn rasterization_material_bucket( alpha_mode: u32, draw_mode: u32, side: u32 ) -> u32{
-    return ( ( alpha_mode & ${mask_alpha} ) << ${shift_alpha} ) 
-         | ( ( draw_mode & ${mask_primitive} ) << ${shift_primitive} ) 
-         | ( ( side & ${mask_side} ) << ${shift_side} );
-}
-    `
-);
-
-/**
- * @see chunk_rasterization_material_bucket
- * @param {number|TransparencyMode} alpha_mode
- * @param {number|ShadeDrawMode} draw_mode
- * @param {number|ShadeDrawSide} side
- * @return {number}
- */
-export function rasterization_material_bucket(alpha_mode, draw_mode, side) {
-    assert.enum(alpha_mode, TransparencyMode);
-    assert.enum(draw_mode, ShadeDrawMode);
-    assert.enum(side, ShadeDrawSide);
-
-    return ((alpha_mode & mask_alpha) << shift_alpha)
-        | ((draw_mode & mask_primitive) << shift_primitive)
-        | ((side & mask_side) << shift_side);
-}
+import { assert } from "../../../../../core/assert.js";
+import { ShadeDrawMode } from "../../../material/ShadeDrawMode.js";
+import { ShadeDrawSide } from "../../../material/ShadeDrawSide.js";
+import { TransparencyMode } from "../../../material/TransparencyMode.js";
+import { CodeChunk } from "../../../shader/compiler/CodeChunk.js";
+import {
+    RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE,
+    RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE
+} from "./RASTERIZATION_BUCKET_LIMIT.js";
+
+// A field of N bits is masked with (1 << N) - 1, not N + 1 (the two coincide only at N == 2,
+// which is the value both of these enums happen to have today).
+const mask_alpha = (1 << RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE) - 1;
+const shift_alpha = 0;
+
+const mask_primitive = (1 << RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE) - 1;
+const shift_primitive = shift_alpha + RASTERIZATION_BUCKET_BIT_COUNT_ALPHA_MODE;
+
+// the last field carries no mask: it is a boolean by construction, not an enum being narrowed
+const shift_double_sided = shift_primitive + RASTERIZATION_BUCKET_BIT_COUNT_DRAW_MODE;
+
+/**
+ * A bucket is a pipeline state, and the third field is the only thing a {@link ShadeDrawSide}
+ * still says about one: whether it culls at all. `Front` and `Back` land in the same bucket —
+ * a back-sided material is a front-sided one whose winding the vertex shader reverses — so a
+ * scene that mixes them draws in one pass, through one expansion chain.
+ *
+ * @see TransparencyMode
+ * @see ShadeDrawMode
+ * @see rasterization_material_bucket
+ * @type {CodeChunk}
+ */
+export const chunk_rasterization_material_bucket = CodeChunk.from(
+    //language=WGSL
+    `
+fn rasterization_material_bucket( alpha_mode: u32, draw_mode: u32, side: u32 ) -> u32{
+    let double_sided = u32( side == ${ShadeDrawSide.Double}u );
+
+    return ( ( alpha_mode & ${mask_alpha} ) << ${shift_alpha} )
+         | ( ( draw_mode & ${mask_primitive} ) << ${shift_primitive} )
+         | ( double_sided << ${shift_double_sided} );
+}
+    `
+);
+
+/**
+ * @see chunk_rasterization_material_bucket
+ * @param {number|TransparencyMode} alpha_mode
+ * @param {number|ShadeDrawMode} draw_mode
+ * @param {number|ShadeDrawSide} side
+ * @return {number}
+ */
+export function rasterization_material_bucket(alpha_mode, draw_mode, side) {
+    assert.enum(alpha_mode, TransparencyMode);
+    assert.enum(draw_mode, ShadeDrawMode);
+    assert.enum(side, ShadeDrawSide);
+
+    const double_sided = side === ShadeDrawSide.Double ? 1 : 0;
+
+    return ((alpha_mode & mask_alpha) << shift_alpha)
+        | ((draw_mode & mask_primitive) << shift_primitive)
+        | (double_sided << shift_double_sided);
+}

package/src/shade/renderer/rasterize/expand/bucket/meshlet/graph_sort_meshlets_by_bucket_id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_sort_meshlets_by_bucket_id.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/rasterize/expand/bucket/meshlet/graph_sort_meshlets_by_bucket_id.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH;IAL+B,KAAK;IACA,SAAS;IAClB,cAAc,EAA9B,MAAM;IACuB,MAAM;QAuG7C"}
+{"version":3,"file":"graph_sort_meshlets_by_bucket_id.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/rasterize/expand/bucket/meshlet/graph_sort_meshlets_by_bucket_id.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH;IAL+B,KAAK;IACA,SAAS;IAClB,cAAc,EAA9B,MAAM;IACuB,MAAM;QA0G7C"}

package/src/shade/renderer/rasterize/expand/bucket/meshlet/graph_sort_meshlets_by_bucket_id.js

@@ -46,6 +46,8 @@ export function graph_sort_meshlets_by_bucket_id({
         const input = resources.get(data.input);
         const command = resources.get(data.command);
 
+        // folded: a meshlet collection is past what one dispatch dimension reaches — see
+        // IndirectComputeCommandBuildPass
         build_indirect_compute_dispatch_command(
             COMPUTE_SHADER_DEFAULT_GROUP_SIZE,
             encoder,
@@ -53,6 +55,7 @@ export function graph_sort_meshlets_by_bucket_id({
             0,
             command,
             0,
+            true,
         );
 
         // count by bucket

package/src/shade/renderer/rasterize/expand/bucket/meshlet/shader_meshlets_count_by_rasterization_bucket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_meshlets_count_by_rasterization_bucket.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/rasterize/expand/bucket/meshlet/shader_meshlets_count_by_rasterization_bucket.js"],"names":[],"mappings":"AAsFA,0EAIG;8BAjF2B,qCAAqC"}
+{"version":3,"file":"shader_meshlets_count_by_rasterization_bucket.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/rasterize/expand/bucket/meshlet/shader_meshlets_count_by_rasterization_bucket.js"],"names":[],"mappings":"AA0FA,0EAIG;8BApF2B,qCAAqC"}