Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openxr: pass app create info completely

Browse Source
This commit is contained in:
galister
2024-02-11 12:04:35 +01:00
parent 8116864416
commit 243b39a5cd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/graphics.rs
View File

@@ -122,7 +122,7 @@ impl WlxGraphics {
use std::ffi::{self, c_char, CString}; use std::ffi::{self, c_char, CString};
use ash::vk::PhysicalDeviceDynamicRenderingFeatures; use ash::vk::PhysicalDeviceDynamicRenderingFeatures;
use vulkano::Handle; use vulkano::{Handle, Version};
use winit::event_loop::EventLoop; use winit::event_loop::EventLoop;
let event_loop = EventLoop::new().unwrap(); let event_loop = EventLoop::new().unwrap();
@@ -142,12 +142,12 @@ impl WlxGraphics {
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let vk_target_version = vk::make_api_version(0, 1, 3, 0); // Vulkan 1.1 guarantees multiview support let vk_target_version = vk::make_api_version(0, 1, 3, 0);
let target_version = vulkano::Version::V1_3; let target_version = vulkano::Version::V1_3;
let library = VulkanLibrary::new().unwrap(); let library = VulkanLibrary::new().unwrap();
let vk_entry = unsafe { ash::Entry::load().unwrap() }; let vk_entry = unsafe { ash::Entry::load().unwrap() };
let vk_app_info = vk::ApplicationInfo::builder() let vk_app_info_raw = vk::ApplicationInfo::builder()
.application_version(0) .application_version(0)
.engine_version(0) .engine_version(0)
.api_version(vk_target_version); .api_version(vk_target_version);
@@ -158,7 +158,7 @@ impl WlxGraphics {
system, system,
std::mem::transmute(vk_entry.static_fn().get_instance_proc_addr), std::mem::transmute(vk_entry.static_fn().get_instance_proc_addr),
&vk::InstanceCreateInfo::builder() &vk::InstanceCreateInfo::builder()
.application_info(&vk_app_info) .application_info(&vk_app_info_raw)
.enabled_extension_names(&instance_extensions_raw) .enabled_extension_names(&instance_extensions_raw)
as *const _ as *const _, as *const _ as *const _,
) )
@@ -170,6 +170,9 @@ impl WlxGraphics {
library, library,
ash::vk::Instance::from_raw(vk_instance as _), ash::vk::Instance::from_raw(vk_instance as _),
InstanceCreateInfo { InstanceCreateInfo {
application_version: Version::major_minor(0, 0),
engine_version: Version::major_minor(0, 0),
max_api_version: Some(Version::V1_3),
enabled_extensions: instance_extensions, enabled_extensions: instance_extensions,
..Default::default() ..Default::default()
}, },