From fe55cd7588c8906cc6cccc868bf863ffe3e7e540 Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Mon, 7 Jul 2025 16:44:56 -0400
Subject: [PATCH] Fix rebase

---
 crates/bevy_solari/src/realtime/node.rs        | 4 ++--
 crates/bevy_solari/src/realtime/restir_gi.wgsl | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_solari/src/realtime/node.rs b/crates/bevy_solari/src/realtime/node.rs
index 3c3ce4d23b..eaa432d8cb 100644
--- a/crates/bevy_solari/src/realtime/node.rs
+++ b/crates/bevy_solari/src/realtime/node.rs
@@ -273,7 +273,7 @@ impl FromWorld for SolariLightingNode {
                 }],
                 shader: load_embedded_asset!(world, "restir_gi.wgsl"),
                 shader_defs: vec![],
-                entry_point: "initial_and_temporal".into(),
+                entry_point: Some("initial_and_temporal".into()),
                 zero_initialize_workgroup_memory: false,
             });
 
@@ -290,7 +290,7 @@ impl FromWorld for SolariLightingNode {
                 }],
                 shader: load_embedded_asset!(world, "restir_gi.wgsl"),
                 shader_defs: vec![],
-                entry_point: "spatial_and_shade".into(),
+                entry_point: Some("spatial_and_shade".into()),
                 zero_initialize_workgroup_memory: false,
             });
 
diff --git a/crates/bevy_solari/src/realtime/restir_gi.wgsl b/crates/bevy_solari/src/realtime/restir_gi.wgsl
index 3e009e1bd7..039f2e3981 100644
--- a/crates/bevy_solari/src/realtime/restir_gi.wgsl
+++ b/crates/bevy_solari/src/realtime/restir_gi.wgsl
@@ -227,6 +227,7 @@ fn depth_ndc_to_view_z(ndc_depth: f32) -> f32 {
 #endif
 }
 
+// Don't adjust the size of this struct without also adjusting GI_RESERVOIR_STRUCT_SIZE.
 struct Reservoir {
     sample_point_world_position: vec3<f32>,
     weight_sum: f32,