Finalize sync.

Author: tychedelia

crates/processing_ffi/src/lib.rs

@@ -1965,7 +1965,8 @@ pub unsafe extern "C" fn processing_compute_set_float(
     });
 }
 
-/// Set a buffer property on a compute shader.
+/// # Safety
+/// `name` must be a valid null-terminated C string.
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn processing_compute_set_buffer(
     compute_id: u64,

crates/processing_render/src/compute.rs

@@ -1,4 +1,4 @@
-use std::collections::{BTreeSet, HashMap};
+use std::collections::BTreeSet;
 
 use bevy::asset::RenderAssetUsages;
 use bevy::reflect::PartialReflect;
@@ -98,10 +98,7 @@ pub fn write_buffer_cpu(
     let mut asset = buffers
         .get_mut(&handle)
         .ok_or(ProcessingError::BufferNotFound)?;
-    let dst = asset
-        .data
-        .as_mut()
-        .ok_or(ProcessingError::BufferNotFound)?;
+    let dst = asset.data.as_mut().ok_or(ProcessingError::BufferNotFound)?;
     let start = offset as usize;
     let end = start + data.len();
     dst[start..end].copy_from_slice(&data);
@@ -144,7 +141,7 @@ pub fn read_buffer_gpu(
 
 pub fn invalidate_rw_buffers(mut buffers: Query<&mut Buffer>) {
     for mut buf in &mut buffers {
-        if buf.bound_rw {
+        if buf.bound_rw && buf.synced {
             buf.synced = false;
         }
     }
@@ -161,7 +158,6 @@ pub struct Compute {
     pub entry_point: String,
     pub pipeline_id: CachedComputePipelineId,
     pub bind_group_layout_descriptors: Vec<(u32, BindGroupLayoutDescriptor)>,
-    pub rw_buffers: HashMap<String, Entity>,
 }
 
 fn queue_pipeline(
@@ -225,8 +221,7 @@ pub fn create_compute(app: &mut App, shader_entity: Entity) -> Result<Entity> {
         .collect();
 
     let max_group = groups.iter().last().copied().map_or(0, |g| g + 1);
-    let mut layout_descriptors =
-        vec![BindGroupLayoutDescriptor::default(); max_group as usize];
+    let mut layout_descriptors = vec![BindGroupLayoutDescriptor::default(); max_group as usize];
     for (group, desc) in &bind_group_layout_descriptors {
         layout_descriptors[*group as usize] = desc.clone();
     }
@@ -263,7 +258,6 @@ pub fn create_compute(app: &mut App, shader_entity: Entity) -> Result<Entity> {
                     entry_point,
                     pipeline_id,
                     bind_group_layout_descriptors,
-                    rw_buffers: HashMap::new(),
                 })
                 .id());
         }
@@ -296,10 +290,7 @@ pub fn set_compute_property(
                 .get_mut(*buf_entity)
                 .map_err(|_| ProcessingError::BufferNotFound)?;
             compute.shader.insert(&name, buffer.handle.clone());
-            if read_only {
-                compute.rw_buffers.remove(&name);
-            } else {
-                compute.rw_buffers.insert(name.clone(), *buf_entity);
+            if !read_only {
                 buffer.bound_rw = true;
             }
             Ok(())

crates/processing_render/src/lib.rs

@@ -1549,12 +1549,13 @@ fn ensure_buffer_synced(app: &mut App, entity: Entity) -> error::Result<()> {
         .unwrap()?;
 
     let world = app.world_mut();
-    let mut buffers = world.resource_mut::<Assets<bevy::render::storage::ShaderBuffer>>();
-    let asset = buffers
-        .get_mut_untracked(handle.id())
-        .ok_or(error::ProcessingError::BufferNotFound)?;
-    asset.data = Some(bytes);
-    drop(buffers);
+    {
+        let mut buffers = world.resource_mut::<Assets<bevy::render::storage::ShaderBuffer>>();
+        let asset = buffers
+            .get_mut_untracked(handle.id())
+            .ok_or(error::ProcessingError::BufferNotFound)?;
+        asset.data = Some(bytes);
+    }
 
     let mut buf = world
         .get_mut::<compute::Buffer>(entity)

crates/processing_render/src/material/custom.rs

@@ -307,8 +307,7 @@ pub(crate) fn shader_value_to_reflect(value: &ShaderValue) -> Result<Box<dyn Par
         ShaderValue::Mat4(v) => Box::new(Mat4::from_cols_array(v)),
         ShaderValue::Texture(_) | ShaderValue::Buffer(_) => {
             return Err(ProcessingError::InvalidArgument(
-                "Texture/Buffer must be bound via set_property, not as a uniform value"
-                    .to_string(),
+                "Texture/Buffer must be bound via set_property, not as a uniform value".to_string(),
             ));
         }
     })

crates/processing_render/src/material/mod.rs

@@ -95,20 +95,16 @@ pub fn set_property(
                 .map(|p| p.category())
                 .ok_or_else(|| ProcessingError::UnknownShaderProperty(name.clone()))?;
 
-            match category {
-                ParameterCategory::Storage { read_only } => {
-                    mat.shader.insert(&name, buffer.handle.clone());
-                    if !read_only {
-                        buffer.bound_rw = true;
-                    }
-                    return Ok(());
-                }
-                cat => {
-                    return Err(ProcessingError::InvalidArgument(format!(
-                        "property `{name}` expects {cat:?}, got Buffer"
-                    )));
-                }
+            let ParameterCategory::Storage { read_only } = category else {
+                return Err(ProcessingError::InvalidArgument(format!(
+                    "property `{name}` expects {category:?}, got Buffer"
+                )));
+            };
+            mat.shader.insert(&name, buffer.handle.clone());
+            if !read_only {
+                buffer.bound_rw = true;
             }
+            return Ok(());
         }
 
         return custom::set_property(&mut mat, &name, &value);