Merge #405

405: Derive BufferDescriptor from Serialize/Deserialize r=kvark a=imiklos cc @kvark @zakorgy Co-authored-by: Istvan Miklos <istvan.miklos@h-lab.eu>
gfx-rs · Dec 11, 2019 · 6b097ab · 6b097ab
2 parents 615f6f4 + 45be903
commit 6b097ab
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs
@@ -15,11 +15,14 @@ use crate::{
 use hal;
 use rendy_memory::MemoryBlock;
 use smallvec::SmallVec;
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
 
 use std::{borrow::Borrow, fmt};
 
 bitflags::bitflags! {
     #[repr(transparent)]
+    #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     pub struct BufferUsage: u32 {
         const MAP_READ = 1;
         const MAP_WRITE = 2;
@@ -46,6 +49,7 @@ bitflags::bitflags! {
 }
 
 #[repr(C)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Clone, Debug)]
 pub struct BufferDescriptor {
     pub size: BufferAddress,