@woosh/meep-engine 3.47.0 → 3.49.0

package/src/shade/renderer/buffer/table/GPUDatabase.js

@@ -20,6 +20,7 @@ import { PageBufferPool } from "./PageBufferPool.js";
 import { PageSlotAllocator } from "./PageSlotAllocator.js";
 
 /**
+ * @typedef {import("../../../device/pipeline/PipelineEnquiry.js").PipelineEnquiry} PipelineEnquiry
  * @typedef {import("../../../device/ShadeGPUCommandContext.js").ShadeGPUCommandContext} ShadeGPUCommandContext
  * @typedef {import("./GPUDatabaseDefinition.js").GPUDatabaseDefinition} GPUDatabaseDefinition
  */
@@ -53,6 +54,17 @@ const UPLOAD_CHUNK_SIZE = 256 * KILOBYTE;
  */
 export class GPUDatabase {
 
+    /**
+     * Offer the pipelines {@link update} uploads records with — see {@link PipelineEnquiry}.
+     *
+     * @param {PipelineEnquiry} enquiry
+     */
+    static enquirePipelines(enquiry) {
+        enquiry.compute.push(gpu_table_element_upload_shader.pipeline);
+        enquiry.compute.push(gpu_table_partial_upload_shader.pipeline);
+    }
+
+
     /**
      * Immutable schema.
      * @type {GPUDatabaseDefinition}

package/src/shade/renderer/buffer/table/single/GPUSingleTypeTable.d.ts

@@ -3,6 +3,13 @@
  * @see {GPUDatabase}
  */
 export class GPUSingleTypeTable {
+    /**
+     * Offer the pipeline {@link update} uploads records with, one for every table — see
+     * {@link PipelineEnquiry}.
+     *
+     * @param {PipelineEnquiry} enquiry
+     */
+    static enquirePipelines(enquiry: PipelineEnquiry): void;
     /**
      *
      * @param {Object} options
@@ -71,6 +78,7 @@ export class GPUSingleTypeTable {
     destroy(): void;
     #private;
 }
+export type PipelineEnquiry = import("../../../../device/pipeline/PipelineEnquiry.js").PipelineEnquiry;
 export type ShadeGPUCommandContext = import("../../../../device/ShadeGPUCommandContext.js").ShadeGPUCommandContext;
 export type WebGPUType = import("../../../shader/type/WebGPUType.js").WebGPUType;
 //# sourceMappingURL=GPUSingleTypeTable.d.ts.map

package/src/shade/renderer/buffer/table/single/GPUSingleTypeTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GPUSingleTypeTable.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/buffer/table/single/GPUSingleTypeTable.js"],"names":[],"mappings":"AA6EA;;;GAGG;AACH;IA4DI;;;;;;OAMG;IACH;QAJ8B,MAAM;QACL,IAAI,EAAxB,UAAU;QACO,YAAY,GAA7B,MAAM;OAoBhB;IApFD;;;OAGG;IACH,eAHU,UAAU,CAGf;IAEL;;;OAGG;IACH,2BAAM;IAEN;;;OAGG;IACH,sBAA2E;IAE3E;;;OAGG;IACH,kBAAyB;IA6BzB;;;OAGG;IACH,+BAEC;IA6BD;;;OAGG;IACH,WAFW,MAAM,QAQhB;IAED;;;OAGG;IACH,QAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,WAHW,MAAM,kBAyChB;IAgCD;;;;OAIG;IACH,aAHW,MAAM,OAiBhB;IAuCD;;;OAGG;IACH,oBAFW,sBAAsB,QAkDhC;IAED,0BAQC;IAED,gBAEC;;CACJ;qCA7WY,OAAO,8CAA8C,EAAE,sBAAsB;yBAC7E,OAAO,oCAAoC,EAAE,UAAU"}
+{"version":3,"file":"GPUSingleTypeTable.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/buffer/table/single/GPUSingleTypeTable.js"],"names":[],"mappings":"AA8EA;;;GAGG;AACH;IAEI;;;;;OAKG;IACH,iCAFW,eAAe,QAIzB;IA6DD;;;;;;OAMG;IACH;QAJ8B,MAAM;QACL,IAAI,EAAxB,UAAU;QACO,YAAY,GAA7B,MAAM;OAoBhB;IApFD;;;OAGG;IACH,eAHU,UAAU,CAGf;IAEL;;;OAGG;IACH,2BAAM;IAEN;;;OAGG;IACH,sBAA2E;IAE3E;;;OAGG;IACH,kBAAyB;IA6BzB;;;OAGG;IACH,+BAEC;IA6BD;;;OAGG;IACH,WAFW,MAAM,QAQhB;IAED;;;OAGG;IACH,QAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,WAHW,MAAM,kBAyChB;IAgCD;;;;OAIG;IACH,aAHW,MAAM,OAiBhB;IAuCD;;;OAGG;IACH,oBAFW,sBAAsB,QAkDhC;IAED,0BAQC;IAED,gBAEC;;CACJ;8BAzXY,OAAO,gDAAgD,EAAE,eAAe;qCACxE,OAAO,8CAA8C,EAAE,sBAAsB;yBAC7E,OAAO,oCAAoC,EAAE,UAAU"}

package/src/shade/renderer/buffer/table/single/GPUSingleTypeTable.js

@@ -21,6 +21,7 @@ import { inspect_gpu_buffer_typed } from "../../inspect_gpu_buffer_typed.js";
 import { GPU_DATABASE_UPLOAD_DISPATCH_GROUP_SIZE } from "../GPU_DATABASE_UPLOAD_DISPATCH_GROUP_SIZE.js";
 
 /**
+ * @typedef {import("../../../../device/pipeline/PipelineEnquiry.js").PipelineEnquiry} PipelineEnquiry
  * @typedef {import("../../../../device/ShadeGPUCommandContext.js").ShadeGPUCommandContext} ShadeGPUCommandContext
  * @typedef {import("../../../shader/type/WebGPUType.js").WebGPUType} WebGPUType
  */
@@ -80,6 +81,17 @@ fn main(@builtin(global_invocation_id) global_id : vec3<u32>){
  * @see {GPUDatabase}
  */
 export class GPUSingleTypeTable {
+
+    /**
+     * Offer the pipeline {@link update} uploads records with, one for every table — see
+     * {@link PipelineEnquiry}.
+     *
+     * @param {PipelineEnquiry} enquiry
+     */
+    static enquirePipelines(enquiry) {
+        enquiry.compute.push(update_shader.pipeline);
+    }
+
     /**
      * @type {WebGPUType}
      * @readonly

package/src/shade/renderer/camera/GPUCameraContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GPUCameraContext.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/camera/GPUCameraContext.js"],"names":[],"mappings":"AAgBA;IAyEI;;;;OAIG;IACH,uCAFW,MAAM,EAMhB;IA9ED,iBAEC;IAED;;OAEG;IACH,4BAEC;IAED;;OAEG;IACH,QAFU,cAAc,CAEjB;IAyBP,2CAEC;IAED;;;;OAIG;IACH,qBAHW,MAAM,KACN,MAAM,QAKhB;IAED;;;OAGG;IACH,4CAEC;IAED;;;OAGG;IACH,2CAEC;IAaD,0BAMC;IAED;;;;OAIG;IACH,YAHW,gBAAgB,gBAChB,sBAAsB,QAiChC;IAED,mBAQC;IAED,gBAEC;IAED,eAEC;;CA6EJ;qCArOY,OAAO,wCAAwC,EAAE,sBAAsB;qBACvE,OAAO,aAAa,EAAE,MAAM;+BANV,6BAA6B"}
+{"version":3,"file":"GPUCameraContext.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/camera/GPUCameraContext.js"],"names":[],"mappings":"AAgBA;IAyEI;;;;OAIG;IACH,uCAFW,MAAM,EAMhB;IA9ED,iBAEC;IAED;;OAEG;IACH,4BAEC;IAED;;OAEG;IACH,QAFU,cAAc,CAEjB;IAyBP,2CAEC;IAED;;;;OAIG;IACH,qBAHW,MAAM,KACN,MAAM,QAKhB;IAED;;;OAGG;IACH,4CAEC;IAED;;;OAGG;IACH,2CAEC;IAaD,0BAMC;IAED;;;;OAIG;IACH,YAHW,gBAAgB,gBAChB,sBAAsB,QAiChC;IAED,mBAQC;IAED,gBAEC;IAED,eAEC;;CAwFJ;qCAhPY,OAAO,wCAAwC,EAAE,sBAAsB;qBACvE,OAAO,aAAa,EAAE,MAAM;+BANV,6BAA6B"}

package/src/shade/renderer/camera/GPUCameraContext.js

@@ -173,14 +173,25 @@ export class GPUCameraContext {
         const projection_matrix = new Float64Array(16);
         projection_matrix.set(camera.projection_matrix);
 
-        // Signs are chosen so a positive offset shifts rendered content in the +UV direction
-        // (right/down), which is what the temporal consumers (TAA/NSS un-jitter,
-        // chunk_unjitter_uv) assume. The perspective divide negates whatever is added here:
-        // m[11] == -1 makes clip.w = -z_view, so adding c at m[8]/m[9] shifts NDC by -c —
-        // hence "-=" for x (NDC x aligns with UV x) and "+=" for y (NDC y is UV-flipped,
-        // the two negations cancel).
-        projection_matrix[8] -= this.#view_offset[0];
-        projection_matrix[9] += this.#view_offset[1];
+        // The offset is a constant shift in NDC, at every depth: clip.xy += offset * clip.w, a
+        // translation applied after the projection. Folded into the matrix, that adds the offset
+        // times its w row to its x and y rows. A perspective w row is (0, 0, -1, 0), so the shift
+        // lands in the column view z multiplies, off-axis; an orthographic one is (0, 0, 0, 1), so
+        // it lands in the translation column. Adding to column 2 for both would make the
+        // orthographic shift scale with view z.
+        //
+        // A positive offset shifts rendered content in the +UV direction (right/down), which is
+        // what the temporal consumers (TAA/NSS un-jitter, chunk_unjitter_uv) assume: NDC x
+        // aligns with UV x, NDC y is UV-flipped.
+        const offset_x = this.#view_offset[0];
+        const offset_y = -this.#view_offset[1];
+
+        for (let column = 0; column < 16; column += 4) {
+            const w = projection_matrix[column + 3];
+
+            projection_matrix[column] += offset_x * w;
+            projection_matrix[column + 1] += offset_y * w;
+        }
 
         // build view-projection matrix
         const view_projection_matrix = this.#view_projection_matrix;

package/src/shade/renderer/deferred/chunk_read_gBuffer_material.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_read_gBuffer_material.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/chunk_read_gBuffer_material.js"],"names":[],"mappings":"AAQA,oDAqDE;0BAvDwB,iCAAiC"}
+{"version":3,"file":"chunk_read_gBuffer_material.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/chunk_read_gBuffer_material.js"],"names":[],"mappings":"AASA,oDAwDE;0BA1DwB,iCAAiC"}

package/src/shade/renderer/deferred/chunk_read_gBuffer_material.js

@@ -1,4 +1,5 @@
 import { BSDF_ROUGHNESS_MINIMUM } from "../light/environment/DEFINES.js";
+import { chunk_MIN_DIELECTRICS_F0 } from "../shader/chunk/brdf/chunk_MIN_DIELECTRICS_F0.js";
 import { chunk_rgbe9995_decode } from "../shader/chunk/color/rgbe9995/chunk_rgbe9995_decode.js";
 import { chunk_decode_g_buffer_metalness } from "../shader/chunk/material/chunk_decode_g_buffer_metalness.js";
 import { chunk_decode_g_buffer_roughness } from "../shader/chunk/material/chunk_decode_g_buffer_roughness.js";
@@ -47,6 +48,8 @@ fn read_gBuffer_material(
 
     material.specularF0 = metalness_to_specular_color(f_metalness, albedo);
     material.specularF90 = 1.0;
+    material.specularF0_dielectric = vec3(MIN_DIELECTRICS_F0);
+    material.specularF0_metal = albedo;
     
     material.emissive = emissive;
     
@@ -55,6 +58,7 @@ fn read_gBuffer_material(
     `, [
         MATERIAL_SHADING_INFO_STRUCT.declaration_chunk,
         chunk_metalness_to_specular_color,
+        chunk_MIN_DIELECTRICS_F0,
         chunk_decode_g_buffer_roughness,
         chunk_decode_g_buffer_metalness,
         chunk_rgbe9995_decode

package/src/shade/renderer/deferred/chunk_shade_standard_material_direct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_shade_standard_material_direct.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/chunk_shade_standard_material_direct.js"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,mDAFU,SAAS,CAuFjB;0BAhHwB,iCAAiC"}
+{"version":3,"file":"chunk_shade_standard_material_direct.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/chunk_shade_standard_material_direct.js"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,mDAFU,SAAS,CA0FjB;0BAnHwB,iCAAiC"}

package/src/shade/renderer/deferred/chunk_shade_standard_material_direct.js

@@ -3,6 +3,7 @@ import { chunk_light_cluster_metadata_by_position } from "../light/cluster/chunk
 import { chunk_get_point_light_info_by_index } from "../shader/chunk/light/io/chunk_get_point_light_info_by_index.js";
 import { chunk_get_spot_light_info_by_index } from "../shader/chunk/light/io/chunk_get_spot_light_info_by_index.js";
 import { REFLECTED_LIGHT_STRUCT } from "../shader/chunk/light/REFLECTED_LIGHT_STRUCT.js";
+import { chunk_re_direct_multiscatter } from "../shader/chunk/material/chunk_re_direct_multiscatter.js";
 import { chunk_re_direct_physical } from "../shader/chunk/material/chunk_re_direct_physical.js";
 import { GEOMETRIC_SHADING_INFO_STRUCT } from "../shader/chunk/material/GEOMETRIC_SHADING_INFO_STRUCT.js";
 import { MATERIAL_SHADING_INFO_STRUCT } from "../shader/chunk/material/MATERIAL_SHADING_INFO_STRUCT.js";
@@ -100,6 +101,8 @@ fn shade_standard_material_direct(
         re_direct_physical(direct_light, geometry, material, &reflected_light);
     }
 
+    re_direct_multiscatter(geometry, material, &reflected_light);
+
     var total_emissive_radiance = vec3(material.emissive);
 
     let outgoing_light = reflected_light.diffuse + reflected_light.specular + total_emissive_radiance;
@@ -111,6 +114,7 @@ fn shade_standard_material_direct(
         GEOMETRIC_SHADING_INFO_STRUCT.declaration_chunk,
         MATERIAL_SHADING_INFO_STRUCT.declaration_chunk,
         chunk_re_direct_physical,
+        chunk_re_direct_multiscatter,
         chunk_light_cluster_metadata_by_position,
         chunk_light_cluster_counts,
         chunk_get_point_light_info_by_index,

package/src/shade/renderer/deferred/chunk_shade_standard_material_direct_restir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_shade_standard_material_direct_restir.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/chunk_shade_standard_material_direct_restir.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;GAWG;AACH,0DAFU,SAAS,CA6BjB;0BA1CwB,iCAAiC"}
+{"version":3,"file":"chunk_shade_standard_material_direct_restir.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/chunk_shade_standard_material_direct_restir.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;GAWG;AACH,0DAFU,SAAS,CAgCjB;0BA7CwB,iCAAiC"}

package/src/shade/renderer/deferred/chunk_shade_standard_material_direct_restir.js

@@ -1,4 +1,5 @@
 import { REFLECTED_LIGHT_STRUCT } from "../shader/chunk/light/REFLECTED_LIGHT_STRUCT.js";
+import { chunk_re_direct_multiscatter } from "../shader/chunk/material/chunk_re_direct_multiscatter.js";
 import { GEOMETRIC_SHADING_INFO_STRUCT } from "../shader/chunk/material/GEOMETRIC_SHADING_INFO_STRUCT.js";
 import { MATERIAL_SHADING_INFO_STRUCT } from "../shader/chunk/material/MATERIAL_SHADING_INFO_STRUCT.js";
 import { CodeChunk } from "../shader/compiler/CodeChunk.js";
@@ -30,6 +31,8 @@ fn shade_standard_material_direct(
 
     shade_directional_lights(material, geometry, &reflected_light);
 
+    re_direct_multiscatter(geometry, material, &reflected_light);
+
     // ReSTIR-resolved point + spot direct lighting (already visibility-tested).
     let restir_radiance = textureLoad(tRestirRadiance, vec2<u32>(coord), 0).rgb;
 
@@ -42,5 +45,6 @@ fn shade_standard_material_direct(
         GEOMETRIC_SHADING_INFO_STRUCT.declaration_chunk,
         MATERIAL_SHADING_INFO_STRUCT.declaration_chunk,
         chunk_shade_directional_lights,
+        chunk_re_direct_multiscatter,
     ]
 );

package/src/shade/renderer/deferred/shader_deferred_main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_deferred_main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_deferred_main.js"],"names":[],"mappings":"AAkJA;;;GAGG;AACH,mCAFU,WAAW,CAMlB;AAEH;;;;GAIG;AACH,0CAFU,WAAW,CAMlB;4BAxJyB,0BAA0B"}
+{"version":3,"file":"shader_deferred_main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_deferred_main.js"],"names":[],"mappings":"AAqJA;;;GAGG;AACH,mCAFU,WAAW,CAMlB;AAEH;;;;GAIG;AACH,0CAFU,WAAW,CAMlB;4BA3JyB,0BAA0B"}

package/src/shade/renderer/deferred/shader_deferred_main.js

@@ -51,6 +51,9 @@ function build_deferred_main_shader({ label, shading_chunk, with_restir }) {
 
     gbuffer_group.addSampler("sLinear", "filtering", SAMPLER_LINEAR_UPSCALE);
 
+    // the split-sum LUT, for the direct specular's multiple-scattering compensation
+    gbuffer_group.addTexture("tSplitSum", "float");
+
     resources.addGroup(SHADING_LIGHT_RESOURCE_GROUP);
 
     resources.createGroup()

package/src/shade/renderer/deferred/shader_tonemap_HDR.d.ts

@@ -1,3 +1,9 @@
+/**
+ * The HDR output with {@link ShadeToneMappingMode.GT7}: GT7 at the display's peak, with the same paper white as
+ * {@link shader_tonemap_LDR}, written as extended Display P3 where 1.0 is SDR white.
+ *
+ * @type {ImageShader}
+ */
 export const shader_tonemap_HDR: ImageShader;
 import { ImageShader } from "../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_HDR.d.ts.map

package/src/shade/renderer/deferred/shader_tonemap_HDR.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_tonemap_HDR.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_HDR.js"],"names":[],"mappings":"AA8DA,6CAYG;4BAlEyB,0BAA0B"}
+{"version":3,"file":"shader_tonemap_HDR.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_HDR.js"],"names":[],"mappings":"AAkEA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BA3EyB,0BAA0B"}

package/src/shade/renderer/deferred/shader_tonemap_HDR.js

@@ -4,6 +4,7 @@ import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
 import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.js";
 import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
 import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_PAPER_WHITE_NITS } from "../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
 import { chunk_tonemap_gt7 } from "../shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js";
 import { CodeChunk } from "../shader/compiler/CodeChunk.js";
 import { ImageShader } from "../shader/ImageShader.js";
@@ -11,13 +12,15 @@ import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSe
 import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
 
 const SETTINGS_STRUCT = WebGPUStruct.from({
+    /**
+     * The display's peak, cd/m². The paper white is not a setting: it is PAPER_WHITE_NITS on both outputs.
+     */
     peak_nits: f32,
-    paper_white_nits: f32,
 });
 
 const resources = new ShaderResourceSetDescriptor();
 
-// per-pass, eight bytes, read-only: immediate data rather than a uniform buffer. exposure stays
+// per-pass, four bytes, read-only: immediate data rather than a uniform buffer. exposure stays
 // bound - it is computed on the GPU, so there is no CPU value to write.
 resources.setImmediate("settings", SETTINGS_STRUCT);
 resources.createGroup()
@@ -39,7 +42,7 @@ fn main(
     color *= exposure.value;
     
     // Finally tonemap
-    color = tonemap_gt7(color, settings.peak_nits, settings.paper_white_nits);
+    color = tonemap_gt7(color, settings.peak_nits, PAPER_WHITE_NITS);
     
     // NOTE: no dithering, colorspace is wide
     
@@ -54,12 +57,19 @@ fn main(
 }
     `, [
         chunk_tonemap_gt7,
+        chunk_PAPER_WHITE_NITS,
         chunk_CRM_FROM_REC709_TO_REC2020,
         chunk_CRM_FROM_REC2020_TO_P3,
         chunk_sRGBTransferOETF,
     ]
 );
 
+/**
+ * The HDR output with {@link ShadeToneMappingMode.GT7}: GT7 at the display's peak, with the same paper white as
+ * {@link shader_tonemap_LDR}, written as extended Display P3 where 1.0 is SDR white.
+ *
+ * @type {ImageShader}
+ */
 export const shader_tonemap_HDR = new ImageShader({
     descriptor: ShaderDescriptor.from({
         label: "Tonemap/HDR",

package/src/shade/renderer/deferred/shader_tonemap_HDR_none.d.ts

@@ -0,0 +1,9 @@
+/**
+ * The HDR output with {@link ShadeToneMappingMode.NONE}: exposure and extended Display P3, where 1.0 is SDR white,
+ * and nothing in between.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_HDR_none: ImageShader;
+import { ImageShader } from "../shader/ImageShader.js";
+//# sourceMappingURL=shader_tonemap_HDR_none.d.ts.map

package/src/shade/renderer/deferred/shader_tonemap_HDR_none.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_HDR_none.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_HDR_none.js"],"names":[],"mappings":"AA4CA;;;;;GAKG;AACH,sCAFU,WAAW,CAclB;4BAzDyB,0BAA0B"}

package/src/shade/renderer/deferred/shader_tonemap_HDR_none.js

@@ -0,0 +1,63 @@
+import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.js";
+import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
+import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+
+const resources = new ShaderResourceSetDescriptor();
+resources.createGroup()
+    .addTexture("input_color", "float")
+    .addUniform("exposure", F32_CONTAINER_STRUCT)
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@fragment
+fn main(
+  @builtin(position) coord : vec4<f32>,
+) -> @location(0) vec4<f32> {
+
+    // scene color in linear Rec. 709
+    var color = textureLoad(input_color, vec2i(coord.xy), 0).rgb;
+
+    color *= exposure.value;
+
+    // no tone mapping: 1.0 is SDR white, and what lies above it is shown as far as the display reaches
+
+    // NOTE: no dithering, colorspace is wide
+
+    // output in p3 color space
+    let color_p3 = CRM_FROM_REC2020_TO_P3 * (CRM_FROM_REC709_TO_REC2020 * color);
+
+    // apply gamma. Note that gamma is the same same for "Display P3" and "sRGB"
+    return vec4(sRGBTransferOETF(color_p3), 1.0);
+}
+    `, [
+        chunk_CRM_FROM_REC709_TO_REC2020,
+        chunk_CRM_FROM_REC2020_TO_P3,
+        chunk_sRGBTransferOETF,
+    ]
+);
+
+/**
+ * The HDR output with {@link ShadeToneMappingMode.NONE}: exposure and extended Display P3, where 1.0 is SDR white,
+ * and nothing in between.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_HDR_none = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Tonemap/HDR/none",
+        resources,
+        body
+    }),
+    targets: [
+        {
+            label: "tone-mapped",
+            format: "rgba16float"
+        }
+    ]
+});

package/src/shade/renderer/deferred/shader_tonemap_HDR_pbr_neutral.d.ts

@@ -0,0 +1,10 @@
+/**
+ * The HDR output with {@link ShadeToneMappingMode.PBR_NEUTRAL}: Khronos PBR Neutral with the display's peak over the
+ * paper white in place of the specification's 1, written as extended Display P3 where 1.0 is SDR white. Below the
+ * compression start it writes what {@link shader_tonemap_LDR_pbr_neutral} writes.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_HDR_pbr_neutral: ImageShader;
+import { ImageShader } from "../shader/ImageShader.js";
+//# sourceMappingURL=shader_tonemap_HDR_pbr_neutral.d.ts.map

package/src/shade/renderer/deferred/shader_tonemap_HDR_pbr_neutral.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_HDR_pbr_neutral.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_HDR_pbr_neutral.js"],"names":[],"mappings":"AAmEA;;;;;;GAMG;AACH,6CAFU,WAAW,CAclB;4BA7EyB,0BAA0B"}

package/src/shade/renderer/deferred/shader_tonemap_HDR_pbr_neutral.js

@@ -0,0 +1,87 @@
+import { f32 } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
+import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
+import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.js";
+import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
+import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import { chunk_PAPER_WHITE_NITS } from "../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
+import { chunk_tonemap_khronos_pbr } from "../shader/chunk/color/tonemap/chunk_tonemap_khronos_pbr.js";
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+
+const SETTINGS_STRUCT = WebGPUStruct.from({
+    /**
+     * The display's peak, cd/m². The paper white is not a setting: it is PAPER_WHITE_NITS on both outputs.
+     */
+    peak_nits: f32,
+});
+
+const resources = new ShaderResourceSetDescriptor();
+
+// per-pass, four bytes, read-only: immediate data rather than a uniform buffer. exposure stays
+// bound - it is computed on the GPU, so there is no CPU value to write.
+resources.setImmediate("settings", SETTINGS_STRUCT);
+resources.createGroup()
+    .addTexture("input_color", "float")
+    .addUniform("exposure", F32_CONTAINER_STRUCT)
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@fragment
+fn main(
+  @builtin(position) coord : vec4<f32>,
+) -> @location(0) vec4<f32> {
+
+    // scene color in linear Rec. 709
+    var color = textureLoad(input_color, vec2i(coord.xy), 0).rgb;
+
+    // Apply exposure
+    color *= exposure.value;
+
+    // the display's peak in units of SDR white. A display under the paper white gets the SDR form, which is where
+    // the operator is defined.
+    let peak = max(settings.peak_nits / PAPER_WHITE_NITS, 1.0);
+
+    // It takes non-negative input.
+    color = tonemap_khronos_pbr(max(color, vec3<f32>(0.0)), peak);
+
+    // NOTE: no dithering, colorspace is wide
+
+    // output in p3 color space
+    let color_p3 = CRM_FROM_REC2020_TO_P3 * (CRM_FROM_REC709_TO_REC2020 * color);
+
+    // apply gamma. Note that gamma is the same same for "Display P3" and "sRGB"
+    return vec4(sRGBTransferOETF(color_p3), 1.0);
+}
+    `, [
+        chunk_tonemap_khronos_pbr,
+        chunk_PAPER_WHITE_NITS,
+        chunk_CRM_FROM_REC709_TO_REC2020,
+        chunk_CRM_FROM_REC2020_TO_P3,
+        chunk_sRGBTransferOETF,
+    ]
+);
+
+/**
+ * The HDR output with {@link ShadeToneMappingMode.PBR_NEUTRAL}: Khronos PBR Neutral with the display's peak over the
+ * paper white in place of the specification's 1, written as extended Display P3 where 1.0 is SDR white. Below the
+ * compression start it writes what {@link shader_tonemap_LDR_pbr_neutral} writes.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_HDR_pbr_neutral = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Tonemap/HDR/pbr_neutral",
+        resources,
+        body
+    }),
+    targets: [
+        {
+            label: "tone-mapped",
+            format: "rgba16float"
+        }
+    ]
+});

package/src/shade/renderer/deferred/shader_tonemap_LDR.d.ts

@@ -1,3 +1,9 @@
+/**
+ * The SDR output with {@link ShadeToneMappingMode.GT7}: exposure, GT7 in its SDR mode, Display P3, the sRGB transfer
+ * curve and an 8-bit dither. {@link shader_tonemap_HDR} is the same operator for an HDR display.
+ *
+ * @type {ImageShader}
+ */
 export const shader_tonemap_LDR: ImageShader;
 import { ImageShader } from "../shader/ImageShader.js";
 //# sourceMappingURL=shader_tonemap_LDR.d.ts.map

package/src/shade/renderer/deferred/shader_tonemap_LDR.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_tonemap_LDR.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_LDR.js"],"names":[],"mappings":"AA+CA,6CAYG;4BAlDyB,0BAA0B"}
+{"version":3,"file":"shader_tonemap_LDR.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_LDR.js"],"names":[],"mappings":"AA2DA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BAjEyB,0BAA0B"}

package/src/shade/renderer/deferred/shader_tonemap_LDR.js

@@ -1,8 +1,11 @@
 import { f32 } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
 import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
 import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.js";
+import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
 import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
-import { chunk_tonemap_aces } from "../shader/chunk/color/tonemap/chunk_tonemap_aces.js";
+import { chunk_PAPER_WHITE_NITS } from "../shader/chunk/color/tonemap/chunk_PAPER_WHITE_NITS.js";
+import { chunk_tonemap_gt7 } from "../shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js";
 import {
     chunk_dither_color_8bit_triangle_noise
 } from "../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
@@ -28,10 +31,16 @@ fn main(
         
     color *= exposure.value;
     
-    color = tonemap_aces(color);
+    // GT7's SDR mode: the peak is the paper white, so the result tops out at 1.0. The HDR pass keeps the same paper
+    // white, so below the shoulder the two write the same colour.
+    color = tonemap_gt7(color, PAPER_WHITE_NITS, PAPER_WHITE_NITS);
     
-    // conversion to output colorspace
-    color = sRGBTransferOETF(color);
+    // the canvas is configured "display-p3", so output in P3, as the HDR pass does
+    let color_2020 = CRM_FROM_REC709_TO_REC2020 * color;
+    let color_p3 = CRM_FROM_REC2020_TO_P3 * color_2020;
+    
+    // apply gamma. Note that gamma is the same for "Display P3" and "sRGB"
+    color = sRGBTransferOETF(color_p3);
     
     // apply dither to remove color banding
     color += dither_color_8bit_triangle_noise(coord.xy);
@@ -39,12 +48,21 @@ fn main(
     return vec4(color, 1.0);
 }
     `, [
-        chunk_tonemap_aces,
+        chunk_tonemap_gt7,
+        chunk_PAPER_WHITE_NITS,
+        chunk_CRM_FROM_REC709_TO_REC2020,
+        chunk_CRM_FROM_REC2020_TO_P3,
         chunk_dither_color_8bit_triangle_noise,
         chunk_sRGBTransferOETF,
     ]
 );
 
+/**
+ * The SDR output with {@link ShadeToneMappingMode.GT7}: exposure, GT7 in its SDR mode, Display P3, the sRGB transfer
+ * curve and an 8-bit dither. {@link shader_tonemap_HDR} is the same operator for an HDR display.
+ *
+ * @type {ImageShader}
+ */
 export const shader_tonemap_LDR = new ImageShader({
     descriptor: ShaderDescriptor.from({
         label: "Tonemap/LDR",

package/src/shade/renderer/deferred/shader_tonemap_LDR_none.d.ts

@@ -0,0 +1,9 @@
+/**
+ * The SDR output with {@link ShadeToneMappingMode.NONE}: exposure, Display P3, the sRGB transfer curve and an 8-bit
+ * dither, and nothing in between.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_LDR_none: ImageShader;
+import { ImageShader } from "../shader/ImageShader.js";
+//# sourceMappingURL=shader_tonemap_LDR_none.d.ts.map

package/src/shade/renderer/deferred/shader_tonemap_LDR_none.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader_tonemap_LDR_none.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_LDR_none.js"],"names":[],"mappings":"AAiDA;;;;;GAKG;AACH,sCAFU,WAAW,CAclB;4BA3DyB,0BAA0B"}

package/src/shade/renderer/deferred/shader_tonemap_LDR_none.js

@@ -0,0 +1,68 @@
+import { F32_CONTAINER_STRUCT } from "../shader/type/F32_CONTAINER_STRUCT.js";
+import { chunk_CRM_FROM_REC2020_TO_P3 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC2020_TO_P3.js";
+import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../shader/chunk/color/conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
+import { chunk_sRGBTransferOETF } from "../shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js";
+import {
+    chunk_dither_color_8bit_triangle_noise
+} from "../shader/chunk/texture/dither/chunk_dither_color_8bit_triangle_noise.js";
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+
+const resources = new ShaderResourceSetDescriptor();
+resources.createGroup()
+    .addTexture("input_color", "float")
+    .addUniform("exposure", F32_CONTAINER_STRUCT)
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@fragment
+fn main(
+  @builtin(position) coord : vec4<f32>,
+) -> @location(0) vec4<f32> {
+
+    var color = textureLoad(input_color, vec2i(coord.xy), 0).rgb;
+
+    color *= exposure.value;
+
+    // no tone mapping: the exposed colour as it is, 1.0 at SDR white. The 8-bit target clips what lies above.
+
+    // the canvas is configured "display-p3"
+    let color_p3 = CRM_FROM_REC2020_TO_P3 * (CRM_FROM_REC709_TO_REC2020 * color);
+
+    color = sRGBTransferOETF(color_p3);
+
+    // apply dither to remove color banding
+    color += dither_color_8bit_triangle_noise(coord.xy);
+
+    return vec4(color, 1.0);
+}
+    `, [
+        chunk_CRM_FROM_REC709_TO_REC2020,
+        chunk_CRM_FROM_REC2020_TO_P3,
+        chunk_dither_color_8bit_triangle_noise,
+        chunk_sRGBTransferOETF,
+    ]
+);
+
+/**
+ * The SDR output with {@link ShadeToneMappingMode.NONE}: exposure, Display P3, the sRGB transfer curve and an 8-bit
+ * dither, and nothing in between.
+ *
+ * @type {ImageShader}
+ */
+export const shader_tonemap_LDR_none = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Tonemap/LDR/none",
+        resources,
+        body
+    }),
+    targets: [
+        {
+            label: "tone-mapped",
+            format: "rgba8unorm"
+        }
+    ]
+});