Fix rebase

This commit is contained in:
JMS55 2025-07-07 16:44:56 -04:00
parent 06d9b377d5
commit fe55cd7588
2 changed files with 3 additions and 2 deletions

View File

@ -273,7 +273,7 @@ impl FromWorld for SolariLightingNode {
}], }],
shader: load_embedded_asset!(world, "restir_gi.wgsl"), shader: load_embedded_asset!(world, "restir_gi.wgsl"),
shader_defs: vec![], shader_defs: vec![],
entry_point: "initial_and_temporal".into(), entry_point: Some("initial_and_temporal".into()),
zero_initialize_workgroup_memory: false, zero_initialize_workgroup_memory: false,
}); });
@ -290,7 +290,7 @@ impl FromWorld for SolariLightingNode {
}], }],
shader: load_embedded_asset!(world, "restir_gi.wgsl"), shader: load_embedded_asset!(world, "restir_gi.wgsl"),
shader_defs: vec![], shader_defs: vec![],
entry_point: "spatial_and_shade".into(), entry_point: Some("spatial_and_shade".into()),
zero_initialize_workgroup_memory: false, zero_initialize_workgroup_memory: false,
}); });

View File

@ -227,6 +227,7 @@ fn depth_ndc_to_view_z(ndc_depth: f32) -> f32 {
#endif #endif
} }
// Don't adjust the size of this struct without also adjusting GI_RESERVOIR_STRUCT_SIZE.
struct Reservoir { struct Reservoir {
sample_point_world_position: vec3<f32>, sample_point_world_position: vec3<f32>,
weight_sum: f32, weight_sum: f32,