@woosh/meep-engine 3.49.0 → 3.50.0

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

@@ -1,16 +1,17 @@
-import { chunk_shade_standard_material_direct } from "./chunk_shade_standard_material_direct.js";
-
-/**
- * Brute-force deferred direct shading: directional lights (shared CSM helper) plus a per-pixel loop
- * over every point/spot light in the froxel cluster, each shadow-mapped. The ReSTIR DI variant
- * ({@link chunk_shade_standard_material_direct_restir}) replaces the cluster loop with one resampled,
- * ray-traced sample; the two are selected as separate compiled shaders, not via a runtime branch.
- *
- * This *is* {@link chunk_shade_standard_material_direct}. The two were separate chunks declaring one
- * WGSL function name with byte-identical cluster loops, differing only in whether the directional
- * half called `shade_directional_lights` or re-inlined it. The name is kept because it is public
- * surface and because it reads next to `_restir` at the deferred pass's selection site.
- *
- * @type {CodeChunk}
- */
-export const chunk_shade_standard_material_direct_heavy = chunk_shade_standard_material_direct;
+import { chunk_shade_standard_material_direct } from "./chunk_shade_standard_material_direct.js";
+
+/**
+ * Brute-force deferred direct shading: directional lights (shared CSM helper) plus a per-pixel loop
+ * over every point/spot light in the froxel cluster, each shadow-mapped. The ReSTIR DI variant
+ * ({@link chunk_shade_standard_material_direct_restir}) replaces the cluster loop with one resampled,
+ * ray-traced sample; the deferred pass links one of the two by a shader switch
+ * (`chunk_shade_standard_material_direct_deferred`), not via a runtime branch.
+ *
+ * This *is* {@link chunk_shade_standard_material_direct}. The two were separate chunks declaring one
+ * WGSL function name with byte-identical cluster loops, differing only in whether the directional
+ * half called `shade_directional_lights` or re-inlined it. The name is kept because it is public
+ * surface.
+ *
+ * @type {CodeChunk}
+ */
+export const chunk_shade_standard_material_direct_heavy = chunk_shade_standard_material_direct;

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

@@ -5,8 +5,9 @@
  * the ReSTIR-resolved radiance texture (`tRestirRadiance`, already
  * visibility-tested). Directional lights still go through the shared CSM helper.
  *
- * Selected as a separate compiled shader (`shader_deferred_main_restir`), never
- * via a runtime branch. Requires the `tRestirRadiance` texture binding.
+ * The deferred pass links it when the renderer shades local lights with ReSTIR
+ * (`chunk_shade_standard_material_direct_deferred`), never via a runtime branch.
+ * Reads the `tRestirRadiance` texture binding.
  *
  * @type {CodeChunk}
  */

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":"AAOA;;;;;;;;;;;GAWG;AACH,0DAFU,SAAS,CAgCjB;0BA7CwB,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":"AAQA;;;;;;;;;;;;GAYG;AACH,0DAFU,SAAS,CAmCjB;0BAlDwB,iCAAiC"}

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

@@ -4,6 +4,7 @@ import { GEOMETRIC_SHADING_INFO_STRUCT } from "../shader/chunk/material/GEOMETRI
 import { MATERIAL_SHADING_INFO_STRUCT } from "../shader/chunk/material/MATERIAL_SHADING_INFO_STRUCT.js";
 import { CodeChunk } from "../shader/compiler/CodeChunk.js";
 import { chunk_shade_directional_lights } from "./chunk_shade_directional_lights.js";
+import { RESTIR_RADIANCE_RESOURCE } from "../restir/di/RESTIR_RADIANCE_RESOURCE.js";
 
 /**
  * ReSTIR DI variant of {@link chunk_shade_standard_material_direct_heavy}: same
@@ -12,8 +13,9 @@ import { chunk_shade_directional_lights } from "./chunk_shade_directional_lights
  * the ReSTIR-resolved radiance texture (`tRestirRadiance`, already
  * visibility-tested). Directional lights still go through the shared CSM helper.
  *
- * Selected as a separate compiled shader (`shader_deferred_main_restir`), never
- * via a runtime branch. Requires the `tRestirRadiance` texture binding.
+ * The deferred pass links it when the renderer shades local lights with ReSTIR
+ * (`chunk_shade_standard_material_direct_deferred`), never via a runtime branch.
+ * Reads the `tRestirRadiance` texture binding.
  *
  * @type {CodeChunk}
  */
@@ -25,6 +27,9 @@ fn shade_standard_material_direct(
     geometry: ${GEOMETRIC_SHADING_INFO_STRUCT.wgsl_ref},
     coord: vec2<f32>,
     view_depth: f32,
+    // the brute-force variant's light budgets; this one takes one resampled light and has none
+    point_budget: u32,
+    spot_budget: u32,
 ) -> vec3<f32>{
 
     var reflected_light : ${REFLECTED_LIGHT_STRUCT.wgsl_ref};
@@ -48,3 +53,5 @@ fn shade_standard_material_direct(
         chunk_re_direct_multiscatter,
     ]
 );
+
+chunk_shade_standard_material_direct_restir.requireResource(RESTIR_RADIANCE_RESOURCE);

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_get_ibl_irradiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.js"],"names":[],"mappings":"AAIA;;;GAGG;AACH,uCAFU,SAAS,CAYjB;0BAhBwB,oCAAoC"}
+{"version":3,"file":"chunk_get_ibl_irradiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,uCAFU,SAAS,CAYjB;0BAjBwB,oCAAoC"}

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.js

@@ -1,6 +1,7 @@
 import { PI_DECLARATION } from "../../shader/chunk/math/PI_DECLARATION.js";
 import { chunk_sample_environment_map } from "../../shader/chunk/texture/sample/chunk_sample_environment_map.js";
 import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ENVIRONMENT_MAP_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_RESOURCE.js";
 
 /**
  * see https://github.com/mrdoob/three.js/blob/089e36db16a6fbaf8cd12fbc8b6abfa3beaa4801/src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js#L4
@@ -16,4 +17,6 @@ fn get_ibl_irradiance(normal: vec3<f32>) -> vec3<f32> {
         chunk_sample_environment_map,
         PI_DECLARATION,
     ]
-);
+);
+
+chunk_get_ibl_irradiance.requireResource(ENVIRONMENT_MAP_RESOURCE);

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_get_ibl_radiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.js"],"names":[],"mappings":"AAIA;;;GAGG;AACH,qCAFU,SAAS,CAqBZ;0BAzBmB,oCAAoC"}
+{"version":3,"file":"chunk_get_ibl_radiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,qCAFU,SAAS,CAqBZ;0BA1BmB,oCAAoC"}

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.js

@@ -1,6 +1,7 @@
 import { PI_DECLARATION } from "../../shader/chunk/math/PI_DECLARATION.js";
 import { chunk_sample_environment_map } from "../../shader/chunk/texture/sample/chunk_sample_environment_map.js";
 import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
+import { ENVIRONMENT_MAP_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_RESOURCE.js";
 
 /**
  * @see https://github.com/mrdoob/three.js/blob/ac8d338cc4de9c9529cbdb0d256eb0fc50a86a93/src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js#L22
@@ -25,4 +26,6 @@ fn get_ibl_radiance(
 `, [
         chunk_sample_environment_map,
         PI_DECLARATION,
-    ]);
+    ]);
+
+chunk_get_ibl_radiance.requireResource(ENVIRONMENT_MAP_RESOURCE);

package/src/shade/renderer/deferred/indirect/chunk_lpv_sample_light.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_lpv_sample_light.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_lpv_sample_light.js"],"names":[],"mappings":"AA+BA;;GAEG;AACH,qCAFU,SAAS,CAsDjB;0BA1DwB,oCAAoC"}
+{"version":3,"file":"chunk_lpv_sample_light.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_lpv_sample_light.js"],"names":[],"mappings":"AAmCA;;GAEG;AACH,qCAFU,SAAS,CAsDjB;0BA9DwB,oCAAoC"}

package/src/shade/renderer/deferred/indirect/chunk_lpv_sample_light.js

@@ -28,6 +28,10 @@ import {
 import { chunk_sh3_convolve_with_GGX } from "../../shader/chunk/spherical_harmonics/chunk_sh3_convolve_with_GGX.js";
 import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
 import { LPV_SAMPLE_COORDINATES } from "./chunk_lpv_2d_cache_sample_irradiance.js";
+import {
+    LPV_ATLAS_RADIANCE_RESOURCE,
+    LPV_METADATA_RESOURCE
+} from "../../global_illumination/probe/octahedral/LPV_SHADER_RESOURCE_GROUP.js";
 
 /**
  * @type {CodeChunk}
@@ -86,3 +90,6 @@ fn lpv_sample_light(
     ]
 );
 
+chunk_lpv_sample_light.requireResource(LPV_ATLAS_RADIANCE_RESOURCE);
+chunk_lpv_sample_light.requireResource(LPV_METADATA_RESOURCE);
+

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

@@ -1,13 +1,18 @@
 /**
- * Brute-force deferred shading (every clustered point/spot light shadow-mapped).
- * @type {ImageShader}
+ * The most point lights, and separately spot lights, of a pixel's cluster cell the deferred pass shades,
+ * each with its shadow map. Chosen, not derived. Past it the rest of that type's list in the cell goes unshaded: the highest ids, except within one 32-light window where the GPU's lane order decides (PROPOSAL_HIERARCHICAL, I.6).
+ * @type {number}
  */
-export const shader_deferred_main: ImageShader;
+export const DEFERRED_LIGHT_BUDGET: number;
 /**
- * ReSTIR DI deferred shading variant — consumes the resolved point+spot radiance
- * texture in place of the brute-force cluster loop.
+ * Deferred shading of the G-buffer: the direct light of every pixel, directional and local. How local
+ * lights are shaded is the renderer's shader switch ({@link chunk_shade_standard_material_direct_deferred}):
+ * every clustered point and spot light shadow-mapped, or ReSTIR DI's resolved radiance from
+ * `tRestirRadiance`. The bindings are the same for both; a pass without ReSTIR leaves the radiance to
+ * its black default.
+ *
  * @type {ImageShader}
  */
-export const shader_deferred_main_restir: ImageShader;
+export const shader_deferred_main: ImageShader;
 import { ImageShader } from "../shader/ImageShader.js";
 //# sourceMappingURL=shader_deferred_main.d.ts.map

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":"AAqJA;;;GAGG;AACH,mCAFU,WAAW,CAMlB;AAEH;;;;GAIG;AACH,0CAFU,WAAW,CAMlB;4BA3JyB,0BAA0B"}
+{"version":3,"file":"shader_deferred_main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_deferred_main.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,oCAFU,MAAM,CAEwB;AAgGxC;;;;;;;;GAQG;AACH,mCAFU,WAAW,CAelB;4BAtIyB,0BAA0B"}

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

@@ -15,55 +15,45 @@ import { ImageShader } from "../shader/ImageShader.js";
 
 import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
 import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+import { BLACK_PIXEL_TEXTURE } from "../texture/util/BLACK_PIXEL_TEXTURE.js";
 import { SAMPLER_LINEAR_UPSCALE } from "../texture/SAMPLER_LINEAR_UPSCALE.js";
 import { VIEW_UNIFORM_STRUCT } from "../view/VIEW_UNIFORM_STRUCT.js";
 import { chunk_read_gBuffer_material } from "./chunk_read_gBuffer_material.js";
-import { chunk_shade_standard_material_direct_heavy } from "./chunk_shade_standard_material_direct_heavy.js";
-import { chunk_shade_standard_material_direct_restir } from "./chunk_shade_standard_material_direct_restir.js";
+import { chunk_shade_standard_material_direct_deferred } from "./chunk_shade_standard_material_direct_deferred.js";
 import { SHADING_LIGHT_RESOURCE_GROUP } from "./SHADING_LIGHT_RESOURCE_GROUP.js";
 
 /**
- * Build a deferred G-buffer shading pass. The two variants share an identical
- * entry — they differ only in which `shade_standard_material_direct`
- * implementation is linked (brute-force cluster loop vs. ReSTIR DI) and, for the
- * ReSTIR variant, an extra `tRestirRadiance` input. Keeping the variant choice
- * at link time avoids a runtime branch / dead bindings in the shader.
- *
- * @param {Object} options
- * @param {string} options.label
- * @param {CodeChunk} options.shading_chunk defines `shade_standard_material_direct`
- * @param {boolean} options.with_restir bind the ReSTIR radiance texture
- * @returns {ImageShader}
+ * The most point lights, and separately spot lights, of a pixel's cluster cell the deferred pass shades,
+ * each with its shadow map. Chosen, not derived. Past it the rest of that type's list in the cell goes unshaded: the highest ids, except within one 32-light window where the GPU's lane order decides (PROPOSAL_HIERARCHICAL, I.6).
+ * @type {number}
  */
-function build_deferred_main_shader({ label, shading_chunk, with_restir }) {
-    const resources = new ShaderResourceSetDescriptor();
-
-    const gbuffer_group = resources.createGroup()
-        .addTexture("gBufferDepth")
-        .addTexture("gBufferPBR")
-        .addTexture("gBufferNormal", "uint")
-        .addTexture("gBufferAlbedo")
-        .addTexture("gBufferEmissive", "uint");
-
-    if (with_restir) {
-        gbuffer_group.addTexture("tRestirRadiance");
-    }
-
-    gbuffer_group.addSampler("sLinear", "filtering", SAMPLER_LINEAR_UPSCALE);
-
+export const DEFERRED_LIGHT_BUDGET = 64;
+
+const resources = new ShaderResourceSetDescriptor();
+
+resources.createGroup()
+    .addTexture("gBufferDepth")
+    .addTexture("gBufferPBR")
+    .addTexture("gBufferNormal", "uint")
+    .addTexture("gBufferAlbedo")
+    .addTexture("gBufferEmissive", "uint")
+    // ReSTIR DI's resolved local light, read when the renderer shades local lights with it; black when
+    // it does not run
+    .addTexture("tRestirRadiance", "unfilterable-float", "2d", false, BLACK_PIXEL_TEXTURE)
+    .addSampler("sLinear", "filtering", SAMPLER_LINEAR_UPSCALE)
     // the split-sum LUT, for the direct specular's multiple-scattering compensation
-    gbuffer_group.addTexture("tSplitSum", "float");
+    .addTexture("tSplitSum", "float");
 
-    resources.addGroup(SHADING_LIGHT_RESOURCE_GROUP);
+resources.addGroup(SHADING_LIGHT_RESOURCE_GROUP);
 
-    resources.createGroup()
-        .addUniform("view", VIEW_UNIFORM_STRUCT)
-        .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-    ;
+resources.createGroup()
+    .addUniform("view", VIEW_UNIFORM_STRUCT)
+    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
+;
 
-    const body = CodeChunk.from(
-        // language=WGSL
-        `
+const body = CodeChunk.from(
+    // language=WGSL
+    `
 @fragment
 fn main(
 
@@ -109,61 +99,50 @@ fn main(
         geometry,
         coord.xy,
         view_depth,
+        ${DEFERRED_LIGHT_BUDGET}u,
+        ${DEFERRED_LIGHT_BUDGET}u,
     );
 
     return vec4(result, 1.0);
 }
 `,
-        [
-            DIRECTIONAL_LIGHT_STRUCT.declaration_chunk,
-            POINT_LIGHT_STRUCT.declaration_chunk,
-            INCIDENT_LIGHT_STRUCT.declaration_chunk,
-            GEOMETRIC_SHADING_INFO_STRUCT.declaration_chunk,
-            MATERIAL_SHADING_INFO_STRUCT.declaration_chunk,
-            chunk_decode_g_buffer_normal,
-            chunk_project_position_from_depth,
-            chunk_mat4_extract_position,
-            chunk_read_gBuffer_material,
-
-            chunk_get_view_space_depth,
-            chunk_random_initialize,
-            shading_chunk,
-        ]
-    );
-
-    return new ImageShader({
-        descriptor: ShaderDescriptor.from({
-            label,
-            resources,
-            body
-        }),
-        depthStencil: DEPTH_STENCIL_FOREGROUND_ONLY,
-        targets: [
-            {
-                label: "shaded",
-                format: "rgba16float"
-            }
-        ]
-    });
-}
+    [
+        DIRECTIONAL_LIGHT_STRUCT.declaration_chunk,
+        POINT_LIGHT_STRUCT.declaration_chunk,
+        INCIDENT_LIGHT_STRUCT.declaration_chunk,
+        GEOMETRIC_SHADING_INFO_STRUCT.declaration_chunk,
+        MATERIAL_SHADING_INFO_STRUCT.declaration_chunk,
+        chunk_decode_g_buffer_normal,
+        chunk_project_position_from_depth,
+        chunk_mat4_extract_position,
+        chunk_read_gBuffer_material,
+
+        chunk_get_view_space_depth,
+        chunk_random_initialize,
+        chunk_shade_standard_material_direct_deferred,
+    ]
+);
 
 /**
- * Brute-force deferred shading (every clustered point/spot light shadow-mapped).
- * @type {ImageShader}
- */
-export const shader_deferred_main = build_deferred_main_shader({
-    label: "Shade From G-Buffer",
-    shading_chunk: chunk_shade_standard_material_direct_heavy,
-    with_restir: false,
-});
-
-/**
- * ReSTIR DI deferred shading variant — consumes the resolved point+spot radiance
- * texture in place of the brute-force cluster loop.
+ * Deferred shading of the G-buffer: the direct light of every pixel, directional and local. How local
+ * lights are shaded is the renderer's shader switch ({@link chunk_shade_standard_material_direct_deferred}):
+ * every clustered point and spot light shadow-mapped, or ReSTIR DI's resolved radiance from
+ * `tRestirRadiance`. The bindings are the same for both; a pass without ReSTIR leaves the radiance to
+ * its black default.
+ *
  * @type {ImageShader}
  */
-export const shader_deferred_main_restir = build_deferred_main_shader({
-    label: "Shade From G-Buffer (ReSTIR DI)",
-    shading_chunk: chunk_shade_standard_material_direct_restir,
-    with_restir: true,
+export const shader_deferred_main = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Shade From G-Buffer",
+        resources,
+        body
+    }),
+    depthStencil: DEPTH_STENCIL_FOREGROUND_ONLY,
+    targets: [
+        {
+            label: "shaded",
+            format: "rgba16float"
+        }
+    ]
 });

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

@@ -1,6 +1,6 @@
 /**
  * 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.
+ * {@link shader_tonemap_LDR}, written in the canvas's primaries, extended, where 1.0 is SDR white.
  *
  * @type {ImageShader}
  */

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":"AAkEA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BA3EyB,0BAA0B"}
+{"version":3,"file":"shader_tonemap_HDR.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_HDR.js"],"names":[],"mappings":"AA4DA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BAvEyB,0BAA0B"}

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

@@ -1,7 +1,5 @@
-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 { TONEMAP_SETTINGS_REC2020_PEAK } from "./TonemapDisplaySettings.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";
@@ -11,18 +9,11 @@ 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.setImmediate("settings", TONEMAP_SETTINGS_REC2020_PEAK);
 resources.createGroup()
     .addTexture("input_color", "float")
     .addUniform("exposure", F32_CONTAINER_STRUCT)
@@ -41,17 +32,21 @@ fn main(
     // Apply exposure
     color *= exposure.value;
     
-    // Finally tonemap
-    color = tonemap_gt7(color, settings.peak_nits, PAPER_WHITE_NITS);
+    // Finally tonemap, in the operator's own Rec.2020
+    let color_2020 = tonemap_gt7_rec2020(CRM_FROM_REC709_TO_REC2020 * color, settings.peak_nits, PAPER_WHITE_NITS);
     
     // NOTE: no dithering, colorspace is wide
     
-    // output in p3 color space
-    let color_2020 = CRM_FROM_REC709_TO_REC2020 * color;
-    let color_p3 = CRM_FROM_REC2020_TO_P3 * color_2020;
+    // into the primaries the canvas reports it was configured with (Renderer#configure_context): Display P3, or
+    // sRGB where the browser would not configure P3
+    let color_display = mat3x3<f32>(
+        settings.display_from_rec2020_c0,
+        settings.display_from_rec2020_c1,
+        settings.display_from_rec2020_c2
+    ) * color_2020;
     
-    // apply gamma. Note that gamma is the same same for "Display P3" and "sRGB"
-    let color_gamma = sRGBTransferOETF(color_p3);
+    // apply gamma. Note that gamma is the same for "Display P3" and "sRGB"
+    let color_gamma = sRGBTransferOETF(color_display);
     
     return vec4(color_gamma, 1.0);
 }
@@ -59,14 +54,13 @@ 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.
+ * {@link shader_tonemap_LDR}, written in the canvas's primaries, extended, where 1.0 is SDR white.
  *
  * @type {ImageShader}
  */

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

@@ -1,6 +1,6 @@
 /**
- * The HDR output with {@link ShadeToneMappingMode.NONE}: exposure and extended Display P3, where 1.0 is SDR white,
- * and nothing in between.
+ * The HDR output with {@link ShadeToneMappingMode.NONE}: exposure and the canvas's primaries, extended, where 1.0 is
+ * SDR white, and nothing in between.
  *
  * @type {ImageShader}
  */

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

@@ -1 +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"}
+{"version":3,"file":"shader_tonemap_HDR_none.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_HDR_none.js"],"names":[],"mappings":"AA+CA;;;;;GAKG;AACH,sCAFU,WAAW,CAclB;4BA7DyB,0BAA0B"}

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

@@ -1,6 +1,5 @@
 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 { TONEMAP_SETTINGS_REC709 } from "./TonemapDisplaySettings.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";
@@ -8,6 +7,7 @@ import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSe
 import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
 
 const resources = new ShaderResourceSetDescriptor();
+resources.setImmediate("settings", TONEMAP_SETTINGS_REC709);
 resources.createGroup()
     .addTexture("input_color", "float")
     .addUniform("exposure", F32_CONTAINER_STRUCT)
@@ -29,22 +29,25 @@ fn main(
 
     // 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);
+    // into the primaries the canvas reports it was configured with (Renderer#configure_context): Display P3, or
+    // sRGB where the browser would not configure P3
+    let color_display = mat3x3<f32>(
+        settings.display_from_rec709_c0,
+        settings.display_from_rec709_c1,
+        settings.display_from_rec709_c2
+    ) * color;
 
-    // apply gamma. Note that gamma is the same same for "Display P3" and "sRGB"
-    return vec4(sRGBTransferOETF(color_p3), 1.0);
+    // apply gamma. Note that gamma is the same for "Display P3" and "sRGB"
+    return vec4(sRGBTransferOETF(color_display), 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.
+ * The HDR output with {@link ShadeToneMappingMode.NONE}: exposure and the canvas's primaries, extended, where 1.0 is
+ * SDR white, and nothing in between.
  *
  * @type {ImageShader}
  */

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

@@ -1,7 +1,7 @@
 /**
  * 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.
+ * paper white in place of the specification's 1, written in the canvas's primaries, extended, where 1.0 is SDR white.
+ * Below the compression start it writes what {@link shader_tonemap_LDR_pbr_neutral} writes.
  *
  * @type {ImageShader}
  */

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

@@ -1 +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"}
+{"version":3,"file":"shader_tonemap_HDR_pbr_neutral.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_HDR_pbr_neutral.js"],"names":[],"mappings":"AA4DA;;;;;;GAMG;AACH,6CAFU,WAAW,CAclB;4BAzEyB,0BAA0B"}

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

@@ -1,8 +1,5 @@
-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 { TONEMAP_SETTINGS_REC709_PEAK } from "./TonemapDisplaySettings.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";
@@ -11,18 +8,11 @@ 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.setImmediate("settings", TONEMAP_SETTINGS_REC709_PEAK);
 resources.createGroup()
     .addTexture("input_color", "float")
     .addUniform("exposure", F32_CONTAINER_STRUCT)
@@ -50,25 +40,28 @@ fn main(
 
     // 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);
+    // into the primaries the canvas reports it was configured with (Renderer#configure_context): Display P3, or
+    // sRGB where the browser would not configure P3
+    let color_display = mat3x3<f32>(
+        settings.display_from_rec709_c0,
+        settings.display_from_rec709_c1,
+        settings.display_from_rec709_c2
+    ) * color;
 
-    // apply gamma. Note that gamma is the same same for "Display P3" and "sRGB"
-    return vec4(sRGBTransferOETF(color_p3), 1.0);
+    // apply gamma. Note that gamma is the same for "Display P3" and "sRGB"
+    return vec4(sRGBTransferOETF(color_display), 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.
+ * paper white in place of the specification's 1, written in the canvas's primaries, extended, where 1.0 is SDR white.
+ * Below the compression start it writes what {@link shader_tonemap_LDR_pbr_neutral} writes.
  *
  * @type {ImageShader}
  */

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

@@ -1,6 +1,6 @@
 /**
- * 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.
+ * The SDR output with {@link ShadeToneMappingMode.GT7}: exposure, GT7 in its SDR mode, the canvas's primaries, the sRGB
+ * transfer curve and an 8-bit dither. {@link shader_tonemap_HDR} is the same operator for an HDR display.
  *
  * @type {ImageShader}
  */

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":"AA2DA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BAjEyB,0BAA0B"}
+{"version":3,"file":"shader_tonemap_LDR.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_tonemap_LDR.js"],"names":[],"mappings":"AA6DA;;;;;GAKG;AACH,iCAFU,WAAW,CAclB;4BArEyB,0BAA0B"}