hodasemi/rFactor2_vk_hud
1
0
Fork 0
Code Issues 2 Pull requests 1 Actions Projects Releases 1 Wiki Activity

Catch panic from Instance::preinitialized

Browse source
This commit is contained in:
hodasemi 2023-01-21 12:54:30 +01:00
parent 058cf4c149
commit 8b355baede
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vk_layer/mod.rs
View file

@ -165,12 +165,26 @@ pub(crate) extern "system" fn create_instance(
// DXVK workaround, it creates the instance twice with different properties // DXVK workaround, it creates the instance twice with different properties
if ext_names.contains(&VkString::new("VK_KHR_surface")) { if ext_names.contains(&VkString::new("VK_KHR_surface")) {
unsafe { unsafe {
let ins = match Instance::preinitialized( let panic_result =
*instance, match std::panic::catch_unwind(|| -> anyhow::Result<std::sync::Arc<Instance>> {
proc_addr, Instance::preinitialized(
&ext_names, *instance,
(*(*create_info).pApplicationInfo).apiVersion, proc_addr,
) { &ext_names,
(*(*create_info).pApplicationInfo).apiVersion,
)
}) {
Ok(panic_ok) => panic_ok,
Err(err) => {
write_log!(format!(
"catched a panic from Instance::preinitialized: {:?}",
err
));
return VK_ERROR_INITIALIZATION_FAILED;
}
};
let ins = match panic_result {
Ok(ins) => ins, Ok(ins) => ins,
Err(err) => { Err(err) => {
write_log!(format!("-> local instance creation failed: {:?}", err)); write_log!(format!("-> local instance creation failed: {:?}", err));