alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #111 from GabrielMajeri/fix-getters

Browse source 
Fix instance getters to support extensions
This commit is contained in:
Maik Klein 2018-08-28 18:11:23 +02:00 committed by GitHub
parent f161e2d967 0c26422215
commit 025f353f9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
ash/src/instance.rs
View file

@ -108,16 +108,13 @@ pub trait InstanceV1_1: InstanceV1_0 {
} }
} }
fn get_physical_device_properties2( unsafe fn get_physical_device_properties2(
&self, &self,
physical_device: vk::PhysicalDevice, physical_device: vk::PhysicalDevice,
) -> vk::PhysicalDeviceProperties2 { prop: &mut vk::PhysicalDeviceProperties2,
unsafe { ) {
let mut prop = mem::uninitialized(); self.fp_v1_1()
self.fp_v1_1() .get_physical_device_properties2(physical_device, prop);
.get_physical_device_properties2(physical_device, &mut prop);
prop
}
} }
fn get_physical_device_format_properties2( fn get_physical_device_format_properties2(
@ -140,24 +137,24 @@ pub trait InstanceV1_1: InstanceV1_0 {
&self, &self,
physical_device: vk::PhysicalDevice, physical_device: vk::PhysicalDevice,
format_info: &vk::PhysicalDeviceImageFormatInfo2, format_info: &vk::PhysicalDeviceImageFormatInfo2,
) -> VkResult<vk::ImageFormatProperties2> { image_format_prop: &mut vk::ImageFormatProperties2
let mut image_format_prop = mem::uninitialized(); ) -> VkResult<()> {
let err_code = self.fp_v1_1().get_physical_device_image_format_properties2( let err_code = self.fp_v1_1().get_physical_device_image_format_properties2(
physical_device, physical_device,
format_info, format_info,
&mut image_format_prop, image_format_prop,
); );
if err_code == vk::Result::SUCCESS { if err_code == vk::Result::SUCCESS {
Ok(image_format_prop) Ok(())
} else { } else {
Err(err_code) Err(err_code)
} }
} }
fn get_physical_device_queue_family_properties2( fn get_physical_device_queue_family_properties2_len(
&self, &self,
physical_device: vk::PhysicalDevice, physical_device: vk::PhysicalDevice,
) -> Vec<vk::QueueFamilyProperties2> { ) -> usize {
unsafe { unsafe {
let mut queue_count = 0; let mut queue_count = 0;
self.fp_v1_1().get_physical_device_queue_family_properties2( self.fp_v1_1().get_physical_device_queue_family_properties2(
@ -165,17 +162,23 @@ pub trait InstanceV1_1: InstanceV1_0 {
&mut queue_count, &mut queue_count,
ptr::null_mut(), ptr::null_mut(),
); );
let mut queue_families_vec = Vec::with_capacity(queue_count as usize); queue_count as usize
self.fp_v1_1().get_physical_device_queue_family_properties2(
physical_device,
&mut queue_count,
queue_families_vec.as_mut_ptr(),
);
queue_families_vec.set_len(queue_count as usize);
queue_families_vec
} }
} }
unsafe fn get_physical_device_queue_family_properties2(
&self,
physical_device: vk::PhysicalDevice,
queue_family_props: &mut [vk::QueueFamilyProperties2]
) {
let mut queue_count = queue_family_props.len() as u32;
self.fp_v1_1().get_physical_device_queue_family_properties2(
physical_device,
&mut queue_count,
queue_family_props.as_mut_ptr(),
);
}
fn get_physical_device_memory_properties2( fn get_physical_device_memory_properties2(
&self, &self,
physical_device: vk::PhysicalDevice, physical_device: vk::PhysicalDevice,