Merge remote-tracking branch 'origin/master'

src/lib.rs

@@ -296,12 +296,7 @@ pub fn get_memory_barrier(
 	let mut src_stages = ash::vk::PipelineStageFlags::empty();
 	let mut dst_stages = ash::vk::PipelineStageFlags::empty();
 
-	let mut memory_barrier = ash::vk::MemoryBarrier {
-		s_type: ash::vk::StructureType::MEMORY_BARRIER,
-		p_next: ::std::ptr::null(),
-		src_access_mask: Default::default(),
-		dst_access_mask: Default::default(),
-	};
+	let mut memory_barrier = ash::vk::MemoryBarrier::default();
 
 	for previous_access in &barrier.previous_accesses {
 		let previous_info = get_access_info(previous_access);
@@ -353,15 +348,12 @@ pub fn get_buffer_memory_barrier(
 	let mut dst_stages = ash::vk::PipelineStageFlags::empty();
 
 	let mut buffer_barrier = ash::vk::BufferMemoryBarrier {
-		s_type: ash::vk::StructureType::BUFFER_MEMORY_BARRIER,
-		p_next: ::std::ptr::null(),
-		src_access_mask: Default::default(),
-		dst_access_mask: Default::default(),
 		src_queue_family_index: barrier.src_queue_family_index,
 		dst_queue_family_index: barrier.dst_queue_family_index,
 		buffer: barrier.buffer,
 		offset: barrier.offset as u64,
 		size: barrier.size as u64,
+		..Default::default()
 	};
 
 	for previous_access in &barrier.previous_accesses {
@@ -414,16 +406,11 @@ pub fn get_image_memory_barrier(
 	let mut dst_stages = ash::vk::PipelineStageFlags::empty();
 
 	let mut image_barrier = ash::vk::ImageMemoryBarrier {
-		s_type: ash::vk::StructureType::IMAGE_MEMORY_BARRIER,
-		p_next: ::std::ptr::null(),
-		src_access_mask: Default::default(),
-		dst_access_mask: Default::default(),
-		old_layout: ash::vk::ImageLayout::UNDEFINED,
-		new_layout: ash::vk::ImageLayout::UNDEFINED,
 		src_queue_family_index: barrier.src_queue_family_index,
 		dst_queue_family_index: barrier.dst_queue_family_index,
 		image: barrier.image,
-		subresource_range: barrier.range.clone(),
+		subresource_range: barrier.range,
+		..Default::default()
 	};
 
 	for previous_access in &barrier.previous_accesses {