@woosh/meep-engine 3.17.1 → 3.18.0

package/src/shade/renderer/postprocess/ssr/resolve/ssr_resolve_shader_LPV.js

@@ -1,367 +1,34 @@
-import { SamplerDescriptor } from "../../../../descriptor/texture/SamplerDescriptor.js";
-import { u32 } from "../../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
-import { WebGPUStruct } from "../../../shader/type/WebGPUStruct.js";
-import { CAMERA_UNIFORM_STRUCT } from "../../../camera/CAMERA_UNIFORM_STRUCT.js";
-import { chunk_get_ibl_radiance } from "../../../deferred/indirect/chunk_get_ibl_radiance.js";
-import { DEPTH_STENCIL_FOREGROUND_ONLY } from "../../../depth/DEPTH_STENCIL_FOREGROUND_ONLY.js";
 import { LPV_SHADER_RESOURCE_GROUP } from "../../../global_illumination/probe/octahedral/LPV_SHADER_RESOURCE_GROUP.js";
-import { chunk_direction_world_to_view } from "../../../shader/chunk/camera/chunk_direction_world_to_view.js";
-import { chunk_project_position_from_depth } from "../../../shader/chunk/camera/chunk_project_position_from_depth.js";
-import { chunk_screen_coordinate_to_view } from "../../../shader/chunk/camera/chunk_screen_coordinate_to_view.js";
-import { chunk_rgb_to_luminance } from "../../../shader/chunk/color/chunk_rgb_to_luminance.js";
-import { chunk_rgb_to_YCoCg } from "../../../shader/chunk/color/YCoCg/chunk_rgb_to_YCoCg.js";
-import { chunk_decode_g_buffer_normal } from "../../../shader/chunk/geometry/normal/chunk_decode_g_buffer_normal.js";
-import { chunk_v3_matrix4_project } from "../../../shader/chunk/geometry/vec3/chunk_v3_matrix4_project.js";
 import { chunk_lpv_sample_irradiance } from "../../../shader/chunk/light/lpv/chunk_lpv_sample_irradiance.js";
 import { chunk_lpv_sample_radiance } from "../../../shader/chunk/light/lpv/chunk_lpv_sample_radiance.js";
-import { chunk_decode_g_buffer_roughness } from "../../../shader/chunk/material/chunk_decode_g_buffer_roughness.js";
-import { RECIPROCAL_PI_DECLARATION } from "../../../shader/chunk/math/RECIPROCAL_PI_DECLARATION.js";
-import { chunk_murmur3_vec3u } from "../../../shader/chunk/random/murmur/chunk_murmur3_vec3u.js";
-import { chunk_texel_coordinate_to_uv } from "../../../shader/chunk/texture/chunk_texel_coordinate_to_uv.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";
-import { chunk_ssr_hit_unpack } from "../chunk_ssr_hit_unpack.js";
-import { chunk_is_background } from "../../../shader/chunk/depth/chunk_is_background.js";
-import { chunk_get_neighbour_weight } from "./chunk_get_neighbour_weight.js";
-import { chunk_get_ray_mip_level } from "./chunk_get_ray_mip_level.js";
-import { chunk_reconstruct_pdf } from "./chunk_reconstruct_pdf.js";
-
-const RESOLVE_UNIFORMS = WebGPUStruct.from({
-    frame_index: u32,
-});
+import { build_ssr_resolve_shader } from "./build_ssr_resolve_shader.js";
 
 const resources = new ShaderResourceSetDescriptor();
-
-// per-pass, four bytes, read-only: immediate data rather than a uniform buffer. lpv_metadata
-// beside it is a scene buffer and stays bound.
-resources.setImmediate("settings", RESOLVE_UNIFORMS);
-resources.createGroup()
-    .addTexture("tTrace", "uint")
-    .addTexture("tDepth")
-    .addTexture("tPBR")
-    .addTexture("tNormal", "uint")
-    .addTexture("tColor", "float")
-    .addTexture("tAlbedoAO", "unfilterable-float")
-    .addTexture("tEnvironment") // pre-filtered environment map
-    .addSampler("sLinear", "filtering", SamplerDescriptor.from({
-        magFilter: "linear",
-        mipmapFilter: "linear",
-        addressModeU: "clamp-to-edge",
-        addressModeV: "clamp-to-edge",
-    }))
-    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-;
-
-resources.addGroup(LPV_SHADER_RESOURCE_GROUP)
-
+resources.addGroup(LPV_SHADER_RESOURCE_GROUP);
 resources.createGroup()
+    .addTexture("tEnvironment")
     .addTexture("lpv_atlas_radiance", "uint")
-    .addTexture("lpv_atlas_depth", "float")
-
-
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-// optimized 7x7 neighbourhood offsets. Optimized for noise diffusion and TAA artifact avoidance
-const NEIGHBOR_OFFSETS = array<vec2<i32>, 48>(
-    vec2<i32>(2, -3),
-    vec2<i32>(3, -1),
-    vec2<i32>(0, -2),
-    vec2<i32>(1, -3),
-    vec2<i32>(3, 0),
-    vec2<i32>(2, -1),
-    vec2<i32>(3, -2),
-    vec2<i32>(2, 2),
-    vec2<i32>(3, 1),
-    vec2<i32>(1, 3),
-    vec2<i32>(3, 3),
-    vec2<i32>(0, 2),
-    vec2<i32>(2, 1),
-    vec2<i32>(1, -1),
-    vec2<i32>(3, -3),
-    vec2<i32>(2, -2),
-    vec2<i32>(0, -3),
-    vec2<i32>(1, 0),
-    vec2<i32>(-2, -1),
-    vec2<i32>(-3, -2),
-    vec2<i32>(-1, -3),
-    vec2<i32>(-3, 1),
-    vec2<i32>(-2, 0),
-    vec2<i32>(-3, -1),
-    vec2<i32>(-3, 2),
-    vec2<i32>(-1, 1),
-    vec2<i32>(-2, 3),
-    vec2<i32>(0, 3),
-    vec2<i32>(1, 2),
-    vec2<i32>(-1, 0),
-    vec2<i32>(-3, 3),
-    vec2<i32>(-2, 2),
-    vec2<i32>(0, 1),
-    vec2<i32>(-1, 3),
-    vec2<i32>(2, 3),
-    vec2<i32>(3, 2),
-    vec2<i32>(1, 1),
-    vec2<i32>(2, 0),
-    vec2<i32>(0, -1),
-    vec2<i32>(-1, 2),
-    vec2<i32>(-2, 1),
-    vec2<i32>(-3, 0),
-    vec2<i32>(-2, -2),
-    vec2<i32>(-1, -1),
-    vec2<i32>(-3, -3),
-    vec2<i32>(1, -2),
-    vec2<i32>(-2, -3),
-    vec2<i32>(-1, -2),
-);
-
-@fragment
-fn main(
-    @builtin(position) coord: vec4<f32>,
-    @location(0) uv: vec2<f32>,
-) -> @location(0) vec4<f32> {
-
-    let coord_i = vec2<i32>(coord.xy);
-
-    let texel_depth = textureLoad(tDepth, coord_i, 0 ).r;
-
-    let this_pbr = textureLoad(tPBR, coord_i, 0);
-    let this_roughness = decode_g_buffer_roughness(this_pbr);
-    
-    let this_normal_ws = decode_g_buffer_normal( textureLoad(tNormal, coord_i, 0).xy );
-    let this_normal_vs = direction_world_to_view(this_normal_ws, camera);
-    
-    let this_position_vs = screen_coordinate_to_view(vec2u(coord_i), tDepth, camera);
-    let view_direction_vs = normalize(-this_position_vs);
-    
-    let render_resolution = textureDimensions(tColor,0).xy;
-    
-    let tan_half_fov = camera.device_depth_to_view_space.w;
-    let focal_length_px = f32(render_resolution.y) / (2.0 * tan_half_fov);
-
-    let trace_texel = textureLoad(tTrace, coord_i, 0);
-
-    let this_hit = ssr_hit_unpack(trace_texel.xy);
-
-    
-    let this_hit_uv = texel_coordinate_to_uv(vec2f(this_hit.position.xy), render_resolution);
-    let this_hit_position_vs = screen_coordinate_to_view(this_hit.position, tDepth, camera);
-    let this_hit_normal_ws = decode_g_buffer_normal( textureLoad(tNormal, this_hit.position, 0).xy );
-    let this_hit_normal_vs = direction_world_to_view(this_hit_normal_ws, camera);
-    
-    let this_ray_direction = normalize(this_hit_position_vs - this_position_vs);
-
-    // TODO special case for background pixels
-
-    let this_confidence = this_hit.confidence;
-    
-    // assume that the center pixel is "ideal", so it's weight is 1.0
-    // we could compute proper weight, but those failed at grazing angles when we tried.
-    let distribution_weight = 1.0;
-    
-    let this_weight = this_confidence * distribution_weight;
-
-    var weight_sum:f32 = this_weight;
-    var max_confidence = this_confidence; // keep track of confidence for final weighting
-    
-    let this_mip = get_ray_mip_level(
-        this_position_vs,
-        this_hit_position_vs,
-        this_hit_normal_vs,
-        this_roughness,
-        focal_length_px,
-    );
-    
-    let this_hit_color_sample = textureSampleLevel(tColor, sLinear, this_hit_uv, this_mip).rgb;
-    
-    let this_hit_luma = rgb_to_luminance(this_hit_color_sample);
-    
-    var result = this_hit_color_sample * this_weight;
-    // weight the seed like every neighbour tap — both accumulators divide by weight_sum
-    var result_luma_moment2 = this_hit_luma * this_hit_luma * this_weight;
-    
-    const NEIGHBOUR_SAMPLE_COUNT = 4;
-
-    let hash_seed = murmur3_vec3u(vec3u(vec2u(coord_i), settings.frame_index));
-
-    for(var i = 0u; i < NEIGHBOUR_SAMPLE_COUNT; i++){
-
-        let heighbour_index = ( hash_seed + i ) % 48;
-
-        let neighbour_coord = coord_i + NEIGHBOR_OFFSETS[heighbour_index];
-
-        let neighbour_normal_ws = decode_g_buffer_normal(textureLoad(tNormal, neighbour_coord, 0).xy);    
-        let neighbour_normal_vs = direction_world_to_view(neighbour_normal_ws, camera);
-
-        let neighbour_pbr = textureLoad(tPBR, neighbour_coord, 0);
-        let neighbour_roughness = decode_g_buffer_roughness(neighbour_pbr);
-        
-        let sample_hit = ssr_hit_unpack(textureLoad(tTrace, neighbour_coord, 0).xy); 
-
-        // reconstruct ray hit position
-        let sample_hit_depth = textureLoad(tDepth, sample_hit.position, 0).r;
-        let sample_hit_uv = texel_coordinate_to_uv(vec2f(sample_hit.position), render_resolution);
-        let sample_hit_position_vs = project_position_from_depth(
-            sample_hit_uv,
-            sample_hit_depth,
-            camera.projection_matrix_inverse,
-        );        
-
-        let sample_direction = normalize(sample_hit_position_vs - this_position_vs);
-
-        // check visibility
-        let sample_hit_normal_ws = decode_g_buffer_normal( textureLoad(tNormal, sample_hit.position.xy, 0).xy );
-        let sample_hit_normal_vs = direction_world_to_view(sample_hit_normal_ws, camera);
-
-        let ray_hit_valid = step( 0, dot(-sample_direction, sample_hit_normal_vs));  
-        let ray_cast_valid = step( 0, dot(sample_direction, this_normal_vs) );
-        
-        // NOTE: we assume that visibility between the center sample and the neighbour is the same. This is incorrect, but thanks to normal visibility weighing and BRDF weighing - it's not noticeable in practice.
-        // technically view direction for the neighbour is different, but it's close enough as an approximation
-        let neighbour_view_direction = view_direction_vs;
-        
-        let neighbour_position_vs = screen_coordinate_to_view(
-            vec2u(neighbour_coord),
-            tDepth,
-            camera,
-        );
-        let neighbour_ray_direction = normalize(sample_hit_position_vs - neighbour_position_vs);
-        
-        // reconstruct PDF for the neighbouring ray
-        // we need this to weigh the neighbour
-        let sample_pdf = reconstruct_pdf(
-            neighbour_normal_vs,
-            neighbour_view_direction,
-            neighbour_ray_direction,
-            neighbour_roughness
-        );
-        
-        let sample_visibility = ray_cast_valid * ray_hit_valid;
-        let confidence_visible = sample_hit.confidence * sample_visibility;
-
-        let normalization_weight = get_neighbour_weight(
-            sample_pdf,
-            sample_direction,
-            view_direction_vs,
-            this_normal_vs,
-            this_roughness,
-        );
-        
-        max_confidence = max(max_confidence, confidence_visible );
-        let weight = confidence_visible * normalization_weight;
-
-        weight_sum += weight;
-
-        let sample_mip = get_ray_mip_level(
-            neighbour_position_vs,
-            sample_hit_position_vs,
-            sample_hit_normal_vs,
-            neighbour_roughness,
-            focal_length_px,
-        );
-        
-        let sample_color = textureSampleLevel(tColor, sLinear, sample_hit_uv, sample_mip).rgb;
-
-        result += sample_color * weight;
-
-        let sample_luma = rgb_to_luminance(sample_color);
-        
-        // track second moment for variance
-        result_luma_moment2 += sample_luma * sample_luma * weight;
-    }
-
-    if(weight_sum < 1e-5){
-        // no valid samples,
-
-        // TODO search further
-    }
-
-    if(weight_sum > 1e-5 ){
-        // only normalize if we got some valid samples
-        result /= weight_sum;
-        result_luma_moment2 /= weight_sum;
-    }
-    
-    let view_direction_ws = ( camera.view_matrix_inverse * vec4(view_direction_vs, 0.0) ).xyz;
-    let this_position_ws = v3_matrix4_project( this_position_vs, camera.view_matrix_inverse );
-    
-    
-    if(this_confidence > 0.05) {
-        // sample secondary bounce from LPV, only sample irradiance
-        // it's cheap and gives good results for background pixels
-        
-        let this_hit_position_ws = v3_matrix4_project( this_hit_position_vs, camera.view_matrix_inverse );
-        let this_hit_direction_ws = normalize(this_hit_position_ws - this_position_ws); 
-        
-        let hit_irradiance = lpv_sample_irradiance(
-            this_hit_position_ws,
-            this_hit_normal_ws,
-            this_hit_direction_ws,
-        );
-        
-        let this_hit_albedo = textureLoad(tAlbedoAO, this_hit.position, 0).rgb;
-        
-        result += this_hit_albedo * hit_irradiance * RECIPROCAL_PI;
-    }
-       
-    // process GI
-        
-    let gi_radiance = lpv_sample_radiance(
-        this_position_ws,
-        this_normal_ws,
-        view_direction_ws,
-        this_roughness,
-    );
-    
-    // NOTE: we don't apply Fresnel here because it's added after denoising
-    
-    let color = mix(gi_radiance, result, max_confidence);
-
-    // compute variance
-    let luma = rgb_to_luminance(result);
-    let variance = max(result_luma_moment2 - luma*luma, 0.0);
-
-    return vec4(color, variance);
-}    
-    `, [
-        chunk_decode_g_buffer_roughness,
-        chunk_direction_world_to_view,
-        chunk_screen_coordinate_to_view,
-        chunk_decode_g_buffer_normal,
-        chunk_rgb_to_YCoCg,
-        chunk_get_ibl_radiance,
-        chunk_ssr_hit_unpack,
-        chunk_texel_coordinate_to_uv,
-        chunk_get_neighbour_weight,
-        chunk_is_background,
-        chunk_murmur3_vec3u,
-        chunk_reconstruct_pdf,
-        chunk_get_ray_mip_level,
-        chunk_project_position_from_depth,
-        chunk_lpv_sample_radiance,
-        chunk_lpv_sample_irradiance,
-        chunk_v3_matrix4_project,
-        RECIPROCAL_PI_DECLARATION,
-        chunk_rgb_to_luminance,
-    ]
-);
-
-/**
- * Maps traced SSR out to actual color
- * @type {ImageShader}
- */
-export const ssr_resolve_shader_LPV = new ImageShader({
-    descriptor: ShaderDescriptor.from({
-        label: "SSR resolve",
-        resources,
-        body
-    }),
-    targets: [
-        // TODO output rgbe5559 color and f16 variance to reduce memory bandwidth
-        {
-            format: "rgba16float"
-        }
-    ],
-    depthStencil: DEPTH_STENCIL_FOREGROUND_ONLY,
-});
+    .addTexture("lpv_atlas_depth", "float");
+
+export const ssr_resolve_shader_LPV = build_ssr_resolve_shader({
+    label: "SSR resolve / LPV",
+    resources,
+    sample_radiance: CodeChunk.from(
+        //language=WGSL
+        `
+fn ssr_sample_radiance(
+    position_ws: vec3f, normal_ws: vec3f, view_direction_ws: vec3f, roughness: f32, coord: vec2u,
+) -> vec3f {
+    return lpv_sample_radiance(position_ws, normal_ws, view_direction_ws, roughness);
+}
+        `, [chunk_lpv_sample_radiance]),
+    sample_hit_irradiance: CodeChunk.from(
+        //language=WGSL
+        `
+fn ssr_sample_hit_irradiance(position_ws: vec3f, normal_ws: vec3f, direction_ws: vec3f) -> vec3f {
+    return lpv_sample_irradiance(position_ws, normal_ws, direction_ws);
+}
+        `, [chunk_lpv_sample_irradiance]),
+});

package/src/shade/renderer/postprocess/ssr/ssr_reproject_shader.d.ts

@@ -5,11 +5,6 @@
  * @type {CodeChunk}
  */
 export const chunk_ssr_history_color_bounding_box_YCoCg: CodeChunk;
-/**
- * Weight samples more heavily when variance is low (less noise)
- * @type {CodeChunk}
- */
-export const chunk_ssr_variance_weight: CodeChunk;
 export const ssr_reproject_shader: ImageShader;
 import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
 import { ImageShader } from "../../shader/ImageShader.js";

package/src/shade/renderer/postprocess/ssr/ssr_reproject_shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr_reproject_shader.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/postprocess/ssr/ssr_reproject_shader.js"],"names":[],"mappings":"AA8BA;;;;;GAKG;AACH,yDAFU,SAAS,CA+ElB;AAED;;;GAGG;AACH,wCAFU,SAAS,CASlB;AA4ID,+CASG;0BA7QuB,oCAAoC;4BAClC,6BAA6B"}
+{"version":3,"file":"ssr_reproject_shader.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/postprocess/ssr/ssr_reproject_shader.js"],"names":[],"mappings":"AAuCA;;;;;GAKG;AACH,yDAFU,SAAS,CA+ElB;AA2ED,+CAGG;0BAjMuB,oCAAoC;4BAClC,6BAA6B"}