From 5bdc675d06f6838fd12bf18d91a08d465edfbdcd Mon Sep 17 00:00:00 2001 From: Schmarni Date: Sun, 5 Jan 2025 01:25:52 +0100 Subject: [PATCH] add needed bevy feature and enable wgpu device feature needed for bevy Signed-off-by: Schmarni --- Cargo.toml | 1 + crates/bevy_openxr/src/openxr/graphics/vulkan.rs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 616713a..a776387 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ bevy = { version = "0.15", default-features = false, features = [ "bevy_core_pipeline", "bevy_winit", "bevy_pbr", + "bevy_window", "x11", ] } bevy_mod_xr.path = "crates/bevy_xr" diff --git a/crates/bevy_openxr/src/openxr/graphics/vulkan.rs b/crates/bevy_openxr/src/openxr/graphics/vulkan.rs index 7214220..a18f584 100644 --- a/crates/bevy_openxr/src/openxr/graphics/vulkan.rs +++ b/crates/bevy_openxr/src/openxr/graphics/vulkan.rs @@ -110,13 +110,12 @@ unsafe impl GraphicsExt for openxr::Vulkan { return Err(OxrError::FailedGraphicsRequirements); }; let vk_entry = unsafe { ash::Entry::load() }?; - let flags = wgpu::InstanceFlags::empty(); + let flags = wgpu::InstanceFlags::default().with_env(); let extensions = ::Instance::desired_extensions(&vk_entry, VK_TARGET_VERSION_ASH, flags)?; let device_extensions = [ ash::khr::swapchain::NAME, ash::khr::draw_indirect_count::NAME, - // #[cfg(target_os = "android")] ash::khr::timeline_semaphore::NAME, ash::khr::imageless_framebuffer::NAME, ash::khr::image_format_list::NAME, @@ -189,7 +188,8 @@ unsafe impl GraphicsExt for openxr::Vulkan { let wgpu_features = wgpu::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES | wgpu::Features::MULTIVIEW | wgpu::Features::MULTI_DRAW_INDIRECT_COUNT - | wgpu::Features::MULTI_DRAW_INDIRECT; + | wgpu::Features::MULTI_DRAW_INDIRECT + | wgpu::Features::TEXTURE_FORMAT_16BIT_NORM; let Some(wgpu_exposed_adapter) = wgpu_vk_instance.expose_adapter(vk_physical_device) else { error!("WGPU failed to provide an adapter");