Fix serde issues

gfx-rs · Apr 25, 2022 · 67c8d92 · 67c8d92
1 parent fd90b21
commit 67c8d92
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/wgpu-core/src/command/bundle.rs b/wgpu-core/src/command/bundle.rs
@@ -88,7 +88,9 @@ pub struct RenderBundleEncoder {
     pub(crate) is_ds_read_only: bool,
 
     // Resource binding dedupe state.
+    #[serde(skip)]
     current_bind_groups: BindGroupStateChange,
+    #[serde(skip)]
     current_pipeline: StateChange<id::RenderPipelineId>,
 }
 
@@ -1231,15 +1233,13 @@ pub mod bundle_ffi {
         offsets: *const DynamicOffset,
         offset_length: usize,
     ) {
-        let redundant = bundle
-            .current_bind_groups
-            .set_and_check_redundant(
-                bind_group_id,
-                index,
-                &mut bundle.base.dynamic_offsets,
-                offsets,
-                offset_length,
-            );
+        let redundant = bundle.current_bind_groups.set_and_check_redundant(
+            bind_group_id,
+            index,
+            &mut bundle.base.dynamic_offsets,
+            offsets,
+            offset_length,
+        );
 
         if redundant {
             return;

diff --git a/wgpu-core/src/command/compute.rs b/wgpu-core/src/command/compute.rs
@@ -78,7 +78,9 @@ pub struct ComputePass {
     parent_id: id::CommandEncoderId,
 
     // Resource binding dedupe state.
+    #[serde(skip)]
     current_bind_groups: BindGroupStateChange,
+    #[serde(skip)]
     current_pipeline: StateChange<id::ComputePipelineId>,
 }
 

diff --git a/wgpu-core/src/command/mod.rs b/wgpu-core/src/command/mod.rs
@@ -426,14 +426,22 @@ impl<T: Copy + PartialEq> StateChange<T> {
     }
 }
 
+impl<T: Copy + PartialEq> Default for StateChange<T> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[derive(Debug)]
 struct BindGroupStateChange {
     last_states: [StateChange<id::BindGroupId>; hal::MAX_BIND_GROUPS],
 }
 
 impl BindGroupStateChange {
     fn new() -> Self {
-        Self { last_states: [StateChange::new(); hal::MAX_BIND_GROUPS] }
+        Self {
+            last_states: [StateChange::new(); hal::MAX_BIND_GROUPS],
+        }
     }
 
     unsafe fn set_and_check_redundant(
@@ -466,6 +474,12 @@ impl BindGroupStateChange {
     }
 }
 
+impl Default for BindGroupStateChange {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 trait MapPassErr<T, O> {
     fn map_pass_err(self, scope: PassErrorScope) -> Result<T, O>;
 }

diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs
@@ -166,7 +166,9 @@ pub struct RenderPass {
     depth_stencil_target: Option<RenderPassDepthStencilAttachment>,
 
     // Resource binding dedupe state.
+    #[serde(skip)]
     current_bind_groups: BindGroupStateChange,
+    #[serde(skip)]
     current_pipeline: StateChange<id::RenderPipelineId>,
 }