@woosh/meep-engine 3.60.4 → 3.60.5

package/src/shade/renderer/water/shader_water_avboit.js

@@ -141,21 +141,22 @@ fn main(@builtin(position) coord: vec4f) -> WaterContribution {
     }), targets: AVBOIT_DRAW_TARGETS,
 });
 
-// Initialize all three final targets in the same render pass as water shading.
-// This samples opaque HDR and needs no COPY_SRC usage or renderer changes.
+// Initialize the background target in the same render pass as water shading: the AVBOIT resolve reads it over the
+// whole screen. Transmission and radiance are constants away from water, and the pass's clear gives them; this draw
+// leaves them alone. It samples opaque HDR and needs no COPY_SRC usage or renderer changes.
 const background_resources = new ShaderResourceSetDescriptor();
 background_resources.createGroup().addTexture('tScene');
 export const shader_water_background_copy = ImageShader.from({
     descriptor: ShaderDescriptor.from({label: 'Water / background initialization', resources: background_resources,
         body: CodeChunk.from(/* language=WGSL */ `
 struct WaterBackground {
-    @location(0) transmission: vec4f, @location(1) radiance: vec4f, @location(2) background: vec4f,
+    @location(2) background: vec4f,
 }
 @fragment
 fn main(@builtin(position) coord: vec4f) -> WaterBackground {
-    return WaterBackground(vec4f(1.0,1.0,1.0,0.0), vec4f(0.0), textureLoad(tScene, vec2i(coord.xy), 0));
+    return WaterBackground(textureLoad(tScene, vec2i(coord.xy), 0));
 }
-`)}), targets: [{format:'rgba32float'}, {format:'rgba16float'}, {format:'rgba16float'}],
+`)}), targets: [{format:'rgba32float', writeMask: 0}, {format:'rgba16float', writeMask: 0}, {format:'rgba16float'}],
     depthStencil: DepthStencilState.from({format:'depth32float', depthWriteEnabled:false, depthCompare:'always'}),
 });
 
@@ -163,7 +164,7 @@ const debug_resources = new ShaderResourceSetDescriptor();
 debug_resources.createGroup().addUniform("inspection", WebGPUStruct.from({ mode: u32, resolution: vec2f }, "WaterInspection").pack())
     .addUniform("camera", CAMERA_UNIFORM_STRUCT).addStorageBuffer("warp", AVBOIT_WARP_STRUCT)
     .addTexture("tIntegral", "float", "3d").addSampler("sLinear", "filtering", SAMPLER_LINEAR_UPSCALE).addTexture("transmission")
-    .addTexture("radiance").addTexture("receiver").addTexture("interface_depth").addTexture("trace_metadata");
+    .addTexture("radiance").addTexture("receiver").addTexture("interface_depth");
 export const shader_water_debug = ImageShader.from({
     descriptor: ShaderDescriptor.from({ label: "Water / inspection", resources: debug_resources,
         body: CodeChunk.from(/* language=WGSL */ `
@@ -188,7 +189,6 @@ fn main(@builtin(position) coord: vec4f) -> @location(0) vec4f {
             color.r = max(color.r, fract(r.w) * 2.0);
         }
         case 5u: { color = textureLoad(radiance, pixel, 0).rgb; }
-        case 6u: { color = vec3f(min(textureLoad(trace_metadata, pixel, 0).g, 1.0)); }
         case 8u, 9u: {
             let z = get_view_space_depth(textureLoad(interface_depth, pixel, 0).r, camera);
             // without the draw's footprint (a derivative this switch cannot take): where the water is

package/src/shade/renderer/water/surface/graph_water_tessellation.d.ts

@@ -30,7 +30,7 @@ export function water_lod_cell_layout(limits: {
  * @param {import("../../../../engine/graphics/render/frame_graph/FrameGraph.js").FrameGraph} options.graph
  * @param {object} options.scene GPU scene context
  * @param {number} options.camera the view's camera uniform resource
- * @param {number} options.meshlets the drawn bodies' meshlets resource, from {@link GPUWaterBodies#meshlets}
+ * @param {number} options.meshlets the drawn bodies' meshlets resource, from {@link graph_water_meshlets}
  * @param {number} options.lod_bodies the view's per-body lattice frames resource, from the same
  * @param {number} options.meshlet_capacity every water meshlet the scene holds: the triangle slots there can be
  * @param {{ranges: number, orthographic: number, level: number, distance: number}} options.lod the view's lattice choice

package/src/shade/renderer/water/surface/graph_water_tessellation.js

@@ -62,7 +62,7 @@ export function water_lod_cell_layout(limits) {
  * @param {import("../../../../engine/graphics/render/frame_graph/FrameGraph.js").FrameGraph} options.graph
  * @param {object} options.scene GPU scene context
  * @param {number} options.camera the view's camera uniform resource
- * @param {number} options.meshlets the drawn bodies' meshlets resource, from {@link GPUWaterBodies#meshlets}
+ * @param {number} options.meshlets the drawn bodies' meshlets resource, from {@link graph_water_meshlets}
  * @param {number} options.lod_bodies the view's per-body lattice frames resource, from the same
  * @param {number} options.meshlet_capacity every water meshlet the scene holds: the triangle slots there can be
  * @param {{ranges: number, orthographic: number, level: number, distance: number}} options.lod the view's lattice choice

package/src/shade/wgsl/emulator/WGSLJavaScriptCompiler.js

@@ -3218,7 +3218,15 @@ function inferBuiltinReturnType(name, args) {
         // the two values; the third argument is the condition
         return commonArgumentType(args.slice(0, 2));
     }
-    if (name === 'textureLoad' || name === 'textureSampleLevel' || name === 'textureSample' || name === 'textureSampleBias' || name === 'textureSampleGrad') {
+    if (name === 'textureLoad') {
+        // A texel is the texture's declared sample type, its format's for a storage texture: an integer texture
+        // loads integers, and a `bitcast` of one must see a u32 or i32, not an f32 that happens to hold the word.
+        const texture = args[0] !== undefined ? args[0].type : null;
+        const scalar = texture !== null && texture.kind === 'texture' ? texture.scalar : 'f32';
+        return { kind: 'vec', size: 4, scalar: scalar === 'u32' || /uint$/.test(scalar) ? 'u32'
+            : scalar === 'i32' || /sint$/.test(scalar) ? 'i32' : 'f32' };
+    }
+    if (name === 'textureSampleLevel' || name === 'textureSample' || name === 'textureSampleBias' || name === 'textureSampleGrad') {
         return { kind: 'vec', size: 4, scalar: 'f32' };
     }
     // Both gathers return the four texels of a 2x2 footprint. Saying so here matters more than