Fix offsets and sizes in buffer barriers

Author: tomaka

Diff for: vulkano/src/buffer/cpu_access.rs

@@ -135,6 +135,11 @@ unsafe impl<T: ?Sized> Buffer for CpuAccessibleBuffer<T> {
         vec![0]
     }
 
+    #[inline]
+    fn block_memory_range(&self, _: usize) -> Range<usize> {
+        0 .. self.size()
+    }
+
     fn needs_fence(&self, _: bool, _: Range<usize>) -> Option<bool> {
         Some(true)
     }

Diff for: vulkano/src/buffer/immutable.rs

@@ -116,6 +116,11 @@ unsafe impl<T: ?Sized> Buffer for ImmutableBuffer<T> {
         vec![0]
     }
 
+    #[inline]
+    fn block_memory_range(&self, _: usize) -> Range<usize> {
+        0 .. self.size()
+    }
+
     fn needs_fence(&self, _: bool, _: Range<usize>) -> Option<bool> {
         Some(true)
     }

Diff for: vulkano/src/buffer/staging.rs

@@ -79,6 +79,11 @@ unsafe impl<T: ?Sized> Buffer for StagingBuffer<T> {
         vec![0]
     }
 
+    #[inline]
+    fn block_memory_range(&self, _: usize) -> Range<usize> {
+        0 .. self.size()
+    }
+
     fn needs_fence(&self, _: bool, _: Range<usize>) -> Option<bool> {
         Some(true)
     }

Diff for: vulkano/src/buffer/traits.rs

@@ -29,6 +29,12 @@ pub unsafe trait Buffer {
     /// The return value must not be empty.
     fn blocks(&self, range: Range<usize>) -> Vec<usize>;
 
+    /// Returns the range of bytes of the memory used by a block.
+    ///
+    /// **Important**: This is not the range in the buffer, but the range in the memory that is
+    ///                backing the buffer.
+    fn block_memory_range(&self, block: usize) -> Range<usize>;
+
     ///
     ///
     /// If the host is still accessing the buffer, this function implementation should block

Diff for: vulkano/src/command_buffer/inner.rs

@@ -1056,6 +1056,8 @@ impl InnerCommandBufferBuilder {
                         src_stages |= vk::PIPELINE_STAGE_HOST_BIT;
                         dst_stages |= access.stages;
 
+                        let range = (buffer.0).0.block_memory_range(buffer.1);
+
                         buffer_barriers.push(vk::BufferMemoryBarrier {
                             sType: vk::STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
                             pNext: ptr::null(),
@@ -1064,8 +1066,8 @@ impl InnerCommandBufferBuilder {
                             srcQueueFamilyIndex: vk::QUEUE_FAMILY_IGNORED,
                             dstQueueFamilyIndex: vk::QUEUE_FAMILY_IGNORED,
                             buffer: (buffer.0).0.inner_buffer().internal_object(),
-                            offset: 0,      // FIXME:
-                            size: 10,       // FIXME:
+                            offset: range.start as u64,
+                            size: (range.end - range.start) as u64,
                         });
                     }
 
@@ -1078,6 +1080,8 @@ impl InnerCommandBufferBuilder {
                         src_stages |= entry.stages;
                         dst_stages |= access.stages;
 
+                        let range = (buffer.0).0.block_memory_range(buffer.1);
+
                         buffer_barriers.push(vk::BufferMemoryBarrier {
                             sType: vk::STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
                             pNext: ptr::null(),
@@ -1086,8 +1090,8 @@ impl InnerCommandBufferBuilder {
                             srcQueueFamilyIndex: vk::QUEUE_FAMILY_IGNORED,
                             dstQueueFamilyIndex: vk::QUEUE_FAMILY_IGNORED,
                             buffer: (buffer.0).0.inner_buffer().internal_object(),
-                            offset: 0,      // FIXME:
-                            size: 10,       // FIXME:
+                            offset: range.start as u64,
+                            size: (range.end - range.start) as u64,
                         });
 
                         entry.stages = access.stages;