mii/rust-openvr
1
0
Fork 0
mirror of https://github.com/mii443/rust-openvr.git synced 2025-08-22 16:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic when no vulkan extensions are required

Browse Source
This commit is contained in:
Benjamin Saunders
2020-04-21 16:43:31 -07:00
parent c070a5bbb7
commit c8dcbc1701
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/compositor/mod.rs
View File

@ -21,10 +21,12 @@ use super::*;
impl Compositor { impl Compositor {
pub fn vulkan_instance_extensions_required(&self) -> Vec<CString> { pub fn vulkan_instance_extensions_required(&self) -> Vec<CString> {
let temp = unsafe { let temp = match unsafe {
get_string(|ptr, n| self.0.GetVulkanInstanceExtensionsRequired.unwrap()(ptr, n)) get_string(|ptr, n| self.0.GetVulkanInstanceExtensionsRequired.unwrap()(ptr, n))
} } {
.unwrap(); Some(x) => x,
None => return Vec::new(),
};
temp.as_bytes() temp.as_bytes()
.split(|&x| x == b' ') .split(|&x| x == b' ')
.map(|x| CString::new(x.to_vec()).expect("extension name contained null byte")) .map(|x| CString::new(x.to_vec()).expect("extension name contained null byte"))
@ -36,10 +38,12 @@ impl Compositor {
&self, &self,
physical_device: *mut VkPhysicalDevice_T, physical_device: *mut VkPhysicalDevice_T,
) -> Vec<CString> { ) -> Vec<CString> {
let temp = get_string(|ptr, n| { let temp = match get_string(|ptr, n| {
self.0.GetVulkanDeviceExtensionsRequired.unwrap()(physical_device, ptr, n) self.0.GetVulkanDeviceExtensionsRequired.unwrap()(physical_device, ptr, n)
}) }) {
.unwrap(); Some(x) => x,
None => return Vec::new(),
};
temp.as_bytes() temp.as_bytes()
.split(|&x| x == b' ') .split(|&x| x == b' ')
.map(|x| CString::new(x.to_vec()).expect("extension name contained null byte")) .map(|x| CString::new(x.to_vec()).expect("extension name contained null byte"))