Add setter for VirtualBlockInfo::flag (#3)

gwihlidal · Jun 18, 2023 · f77d06d · f77d06d
1 parent f327969
commit f77d06d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/definitions.rs b/src/definitions.rs
@@ -3,8 +3,8 @@ use ash::vk;
 use ash::vk::PhysicalDevice;
 use ash::{Device, Instance};
 use bitflags::bitflags;
-use std::ptr;
 use std::marker::PhantomData;
+use std::ptr;
 
 /// Intended usage of memory.
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord)]
@@ -672,8 +672,6 @@ impl From<ffi::VmaAllocationInfo> for AllocationInfo {
     }
 }
 
-
-
 bitflags! {
     /// Flags for configuring `VirtualBlock` construction
     pub struct VirtualBlockCreateFlags: u32 {
@@ -773,6 +771,11 @@ impl<'a> VirtualBlockCreateInfo<'a> {
         self.inner.size = size;
         self
     }
+
+    pub fn flag(mut self, flag: VirtualAllocationCreateFlags) -> Self {
+        self.inner.flags = flag.bits;
+        self
+    }
 }
 
 impl From<&ffi::VmaVirtualAllocationInfo> for VirtualAllocationInfo {
@@ -806,4 +809,3 @@ impl From<VirtualAllocationCreateInfo> for ffi::VmaVirtualAllocationCreateInfo {
         (&info).into()
     }
 }
-
diff --git a/tests/mod.rs b/tests/mod.rs
@@ -296,16 +296,16 @@ fn test_gpu_stats() {
 
 #[test]
 fn create_virtual_block() {
-    let create_info = vma::VirtualBlockCreateInfo::new().size(16 * 1024 * 1024); // 16MB block
-    let _virtual_block = vma::VirtualBlock::new(create_info)
-        .expect("Couldn't create VirtualBlock");
+    let create_info = vma::VirtualBlockCreateInfo::new()
+        .size(16 * 1024 * 1024)
+        .flag(vma::VirtualAllocationCreateFlags::VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK); // 16MB block
+    let _virtual_block = vma::VirtualBlock::new(create_info).expect("Couldn't create VirtualBlock");
 }
 
 #[test]
 fn virtual_allocate_and_free() {
     let create_info = vma::VirtualBlockCreateInfo::new().size(16 * 1024 * 1024); // 16MB block
-    let virtual_block = vma::VirtualBlock::new(create_info)
-        .expect("Couldn't create VirtualBlock");
+    let virtual_block = vma::VirtualBlock::new(create_info).expect("Couldn't create VirtualBlock");
 
     let allocation_info = vma::VirtualAllocationCreateInfo {
         size: 8 * 1024 * 1024,
@@ -338,8 +338,7 @@ fn virtual_allocate_and_free() {
 #[test]
 fn virtual_allocation_user_data() {
     let create_info = vma::VirtualBlockCreateInfo::new().size(16 * 1024 * 1024); // 16MB block
-    let virtual_block = vma::VirtualBlock::new(create_info)
-        .expect("Couldn't create VirtualBlock");
+    let virtual_block = vma::VirtualBlock::new(create_info).expect("Couldn't create VirtualBlock");
 
     let user_data = Box::new(vec![12, 34, 56, 78, 90]);
     let allocation_info = vma::VirtualAllocationCreateInfo {
@@ -351,7 +350,8 @@ fn virtual_allocation_user_data() {
 
     unsafe {
         let (virtual_alloc_0, _) = virtual_block.allocate(allocation_info).unwrap();
-        let queried_info = virtual_block.get_allocation_info(&virtual_alloc_0)
+        let queried_info = virtual_block
+            .get_allocation_info(&virtual_alloc_0)
             .expect("Couldn't get VirtualAllocationInfo from VirtualBlock");
         let queried_user_data = std::slice::from_raw_parts(queried_info.user_data as *const i32, 5);
         assert_eq!(queried_user_data, &*user_data);
@@ -362,8 +362,7 @@ fn virtual_allocation_user_data() {
 #[test]
 fn virtual_block_out_of_space() {
     let create_info = vma::VirtualBlockCreateInfo::new().size(16 * 1024 * 1024); // 16MB block
-    let virtual_block = vma::VirtualBlock::new(create_info)
-        .expect("Couldn't create VirtualBlock");
+    let virtual_block = vma::VirtualBlock::new(create_info).expect("Couldn't create VirtualBlock");
 
     let allocation_info = vma::VirtualAllocationCreateInfo {
         size: 16 * 1024 * 1024 + 1,
@@ -375,7 +374,7 @@ fn virtual_block_out_of_space() {
     unsafe {
         match virtual_block.allocate(allocation_info) {
             Ok(_) => panic!("Created VirtualAllocation larger than VirtualBlock"),
-            Err(ash::vk::Result::ERROR_OUT_OF_DEVICE_MEMORY) => {},
+            Err(ash::vk::Result::ERROR_OUT_OF_DEVICE_MEMORY) => {}
             Err(_) => panic!("Unexpected VirtualBlock error"),
         }
     }