From b0a8f2b977c876142dd8ccd92e008f5c47a7f2dd Mon Sep 17 00:00:00 2001
From: Edgar Geier <egeier@rhrk.uni-kl.de>
Date: Sun, 5 Mar 2023 14:10:04 +0100
Subject: [PATCH] Recrate tonemapping bind group if view uniforms buffer has
 changed

---
 .../src/tonemapping/node.rs                   | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/crates/bevy_core_pipeline/src/tonemapping/node.rs b/crates/bevy_core_pipeline/src/tonemapping/node.rs
index 09690a293e37c..357822fc73c6e 100644
--- a/crates/bevy_core_pipeline/src/tonemapping/node.rs
+++ b/crates/bevy_core_pipeline/src/tonemapping/node.rs
@@ -8,9 +8,9 @@ use bevy_render::{
     render_asset::RenderAssets,
     render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
     render_resource::{
-        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, LoadOp, Operations,
-        PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
-        TextureViewId,
+        BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, BufferId, LoadOp,
+        Operations, PipelineCache, RenderPassColorAttachment, RenderPassDescriptor,
+        SamplerDescriptor, TextureViewId,
     },
     renderer::RenderContext,
     texture::Image,
@@ -29,7 +29,7 @@ pub struct TonemappingNode {
         ),
         With<ExtractedView>,
     >,
-    cached_texture_bind_group: Mutex<Option<(TextureViewId, BindGroup)>>,
+    cached_bind_group: Mutex<Option<(BufferId, TextureViewId, BindGroup)>>,
     last_tonemapping: Mutex<Option<Tonemapping>>,
 }
 
@@ -39,7 +39,7 @@ impl TonemappingNode {
     pub fn new(world: &mut World) -> Self {
         Self {
             query: QueryState::new(world),
-            cached_texture_bind_group: Mutex::new(None),
+            cached_bind_group: Mutex::new(None),
             last_tonemapping: Mutex::new(None),
         }
     }
@@ -65,7 +65,8 @@ impl Node for TonemappingNode {
         let tonemapping_pipeline = world.resource::<TonemappingPipeline>();
         let gpu_images = world.get_resource::<RenderAssets<Image>>().unwrap();
         let view_uniforms_resource = world.resource::<ViewUniforms>();
-        let view_uniforms = view_uniforms_resource.uniforms.binding().unwrap();
+        let view_uniforms = &view_uniforms_resource.uniforms;
+        let view_uniforms_id = view_uniforms.buffer().unwrap().id();
 
         let (view_uniform_offset, target, view_tonemapping_pipeline, tonemapping) =
             match self.query.get_manual(world, view_entity) {
@@ -97,9 +98,15 @@ impl Node for TonemappingNode {
             *last_tonemapping = Some(*tonemapping);
         }
 
-        let mut cached_bind_group = self.cached_texture_bind_group.lock().unwrap();
+        let mut cached_bind_group = self.cached_bind_group.lock().unwrap();
         let bind_group = match &mut *cached_bind_group {
-            Some((id, bind_group)) if source.id() == *id && !tonemapping_changed => bind_group,
+            Some((buffer_id, texture_id, bind_group))
+                if view_uniforms_id == *buffer_id
+                    && source.id() == *texture_id
+                    && !tonemapping_changed =>
+            {
+                bind_group
+            }
             cached_bind_group => {
                 let sampler = render_context
                     .render_device()
@@ -110,7 +117,7 @@ impl Node for TonemappingNode {
                 let mut entries = vec![
                     BindGroupEntry {
                         binding: 0,
-                        resource: view_uniforms.clone(),
+                        resource: view_uniforms.binding().unwrap(),
                     },
                     BindGroupEntry {
                         binding: 1,
@@ -138,7 +145,8 @@ impl Node for TonemappingNode {
                             entries: &entries,
                         });
 
-                let (_, bind_group) = cached_bind_group.insert((source.id(), bind_group));
+                let (_, _, bind_group) =
+                    cached_bind_group.insert((view_uniforms_id, source.id(), bind_group));
                 bind_group
             }
         };