Switch to wgpu master

zmerp · zmerp · commit 9ce34a28d41f · 2021-07-26T14:34:14.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ readme = "README.md"
 repository = "https://github.com/bevyengine/bevy"
 
 [workspace]
+resolver = "2"
 exclude = ["benches"]
 members = ["crates/*", "examples/ios", "tools/ci"]
 
diff --git a/crates/bevy_openxr/Cargo.toml b/crates/bevy_openxr/Cargo.toml
@@ -25,20 +25,10 @@ bevy_xr = { path = "../bevy_xr", version = "0.5.0" }
 openxr = { git = "https://github.com/Ralith/openxrs" }
 serde = "1"
 ash = "0.32.1"
-# wgpu = { path = "../../../wgpu/wgpu" }
-wgpu = "0.9"
+wgpu = { git = "https://github.com/gfx-rs/wgpu" }
+wgpu-hal = { git = "https://github.com/gfx-rs/wgpu", features = ["vulkan"] } # vulkan flag used for macos dev. todo remove
 thiserror = "1.0"
 parking_lot = "0.11"
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-glue = "0.3.0"
-
-# [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-# wgpu-hal = { path = "../../../wgpu/wgpu-hal", features = ["vulkan"] }
-
-# [target.'cfg(windows)'.dependencies]
-# wgpu-hal = { path = "../../../wgpu/wgpu-hal", features = ["dx11"] }
-
-#dev
-# [target.'cfg(target_os = "macos")'.dependencies]
-# wgpu-hal = { path = "../../../wgpu/wgpu-hal", features = ["vulkan"] }
diff --git a/crates/bevy_openxr/src/interaction/tracking.rs b/crates/bevy_openxr/src/interaction/tracking.rs
@@ -229,9 +229,9 @@ impl XrTrackingSourceBackend for TrackingSource {
             .session
             .create_reference_space(reference_type, xr::Posef::IDENTITY)
         {
-            let reference_ref = &mut self.context.reference.write();
-            reference_ref.space_type = reference_type;
-            reference_ref.space = space;
+            let reference = &mut self.context.reference.write();
+            reference.space_type = reference_type;
+            reference.space = space;
 
             true
         } else {
diff --git a/crates/bevy_openxr/src/presentation.rs b/crates/bevy_openxr/src/presentation.rs
@@ -5,9 +5,9 @@ use ash::{
 use bevy_xr::presentation::XrGraphicsContext;
 use openxr as xr;
 use std::{error::Error, ffi::CString, sync::Arc};
-// use wgpu_hal as hal;
-// #[cfg(windows)]
-// use winapi::um::d3d11::ID3D11Device;
+use wgpu_hal as hal;
+#[cfg(windows)]
+use winapi::um::d3d11::ID3D11Device;
 
 #[derive(Clone)]
 pub enum GraphicsContextHandles {
@@ -51,25 +51,25 @@ pub fn create_graphics_context(
             .engine_version(0)
             .api_version(vk_version);
 
-        // let mut flags = hal::InstanceFlags::empty();
-        // if cfg!(debug_assertions) {
-        //     flags |= hal::InstanceFlags::VALIDATION;
-        //     flags |= hal::InstanceFlags::DEBUG;
-        // }
-
-        // let instance_extensions = <hal::api::Vulkan as hal::Api>::Instance::required_extensions(
-        //     &vk_entry, vk_version, flags,
-        // )
-        // .map_err(Box::new)?;
-        // let mut instance_extensions_ptrs = instance_extensions
-        //     .iter()
-        //     .map(|x| x.as_ptr())
-        //     .collect::<Vec<_>>();
-        let mut instance_extensions_ptrs = vec![];
+        let mut flags = hal::InstanceFlags::empty();
+        if cfg!(debug_assertions) {
+            flags |= hal::InstanceFlags::VALIDATION;
+            flags |= hal::InstanceFlags::DEBUG;
+        }
+
+        let instance_extensions = <hal::api::Vulkan as hal::Api>::Instance::required_extensions(
+            &vk_entry, vk_version, flags,
+        )
+        .map_err(Box::new)?;
+        let mut instance_extensions_ptrs = instance_extensions
+            .iter()
+            .map(|x| x.as_ptr())
+            .collect::<Vec<_>>();
+        // let mut instance_extensions_ptrs = vec![];
 
         let vk_instance = if vulkan_ext2 {
-            let vk_instance = unsafe {
-                instance
+            unsafe {
+                let vk_instance = instance
                     .create_vulkan_instance(
                         system,
                         std::mem::transmute(vk_entry.static_fn().get_instance_proc_addr),
@@ -79,10 +79,8 @@ pub fn create_graphics_context(
                             as *const _ as *const _,
                     )
                     .map_err(Box::new)?
-                    .map_err(|e| Box::new(vk::Result::from_raw(e)))?
-            };
+                    .map_err(|e| Box::new(vk::Result::from_raw(e)))?;
 
-            unsafe {
                 ash::Instance::load(
                     vk_entry.static_fn(),
                     vk::Instance::from_raw(vk_instance as _),
@@ -109,26 +107,26 @@ pub fn create_graphics_context(
                     .map_err(Box::new)?
             }
         };
-        // let hal_instance = unsafe {
-        //     <hal::api::Vulkan as hal::Api>::Instance::from_raw(
-        //         vk_entry.clone(),
-        //         vk_instance.clone(),
-        //         vk_version,
-        //         instance_extensions,
-        //         flags,
-        //         Box::new(instance.clone()),
-        //     )
-        //     .map_err(Box::new)?
-        // };
+        let hal_instance = unsafe {
+            <hal::api::Vulkan as hal::Api>::Instance::from_raw(
+                vk_entry.clone(),
+                vk_instance.clone(),
+                vk_version,
+                instance_extensions,
+                flags,
+                Box::new(instance.clone()),
+            )
+            .map_err(Box::new)?
+        };
 
         let vk_physical_device = vk::PhysicalDevice::from_raw(
             instance
                 .vulkan_graphics_device(system, vk_instance.handle().as_raw() as _)
                 .map_err(Box::new)? as _,
         );
-        // let hal_exposed_adapter = hal_instance
-        //     .expose_adapter(vk_physical_device)
-        //     .ok_or_else(|| Box::new(AdapterError))?;
+        let hal_exposed_adapter = hal_instance
+            .expose_adapter(vk_physical_device)
+            .ok_or_else(|| Box::new(AdapterError))?;
 
         let queue_family_index = unsafe {
             vk_instance
@@ -146,18 +144,18 @@ pub fn create_graphics_context(
         };
         let queue_index = 0;
 
-        // let device_extensions = hal_exposed_adapter
-        //     .adapter
-        //     .required_device_extensions(device_descriptor.features);
-        // let mut device_extensions_ptrs = device_extensions
-        //     .iter()
-        //     .map(|x| x.as_ptr())
-        //     .collect::<Vec<_>>();
-        let mut device_extensions_ptrs = vec![];
+        let device_extensions = hal_exposed_adapter
+            .adapter
+            .required_device_extensions(device_descriptor.features);
+        let mut device_extensions_ptrs = device_extensions
+            .iter()
+            .map(|x| x.as_ptr())
+            .collect::<Vec<_>>();
+        // let mut device_extensions_ptrs = vec![];
 
-        // let mut physical_features = hal_exposed_adapter
-        //     .adapter
-        //     .physical_device_features(&device_extensions, device_descriptor.features);
+        let mut physical_features = hal_exposed_adapter
+            .adapter
+            .physical_device_features(&device_extensions, device_descriptor.features);
 
         let family_info = vk::DeviceQueueCreateInfo::builder()
             .queue_family_index(queue_family_index)
@@ -169,7 +167,7 @@ pub fn create_graphics_context(
             let info = vk::DeviceCreateInfo::builder()
                 .queue_create_infos(&family_infos)
                 .enabled_extension_names(&device_extensions_ptrs);
-            // let info = physical_features.add_to_device_create_builder(info).build();
+            let info = physical_features.add_to_device_create_builder(info).build();
 
             unsafe {
                 let vk_device = instance
@@ -197,25 +195,25 @@ pub fn create_graphics_context(
             let info = vk::DeviceCreateInfo::builder()
                 .queue_create_infos(&family_infos)
                 .enabled_extension_names(&device_extensions_ptrs);
-            // let info = physical_features.add_to_device_create_builder(info).build();
+            let info = physical_features.add_to_device_create_builder(info).build();
 
             unsafe {
                 vk_instance
                     .create_device(vk_physical_device, &info, None)
                     .map_err(Box::new)?
             }
         };
-        // let hal_device = unsafe {
-        //     hal_exposed_adapter
-        //         .adapter
-        //         .device_from_raw(
-        //             vk_device.clone(),
-        //             &device_extensions,
-        //             queue_family_index,
-        //             queue_index,
-        //         )
-        //         .map_err(Box::new)?
-        // };
+        let hal_device = unsafe {
+            hal_exposed_adapter
+                .adapter
+                .device_from_raw(
+                    vk_device.clone(),
+                    &device_extensions,
+                    queue_family_index,
+                    queue_index,
+                )
+                .map_err(Box::new)?
+        };
 
         // let wgpu_instance = unsafe { wgpu::Instance::from_hal::<hal::api::Vulkan>(hal_instance) };
         // let wgpu_adapter = unsafe { wgpu_instance.adapter_from_hal(hal_exposed_adapter) };
diff --git a/crates/bevy_wgpu/Cargo.toml b/crates/bevy_wgpu/Cargo.toml
@@ -30,8 +30,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.5.0" }
 bevy_xr = { path = "../bevy_xr", version = "0.5.0" }
 
 # other
-# wgpu = { path = "../../../wgpu/wgpu" }
-wgpu = "0.9"
+wgpu = { git = "https://github.com/gfx-rs/wgpu" }
 futures-lite = "1.4.0"
 crossbeam-channel = "0.5.0"
 crossbeam-utils = "0.8.1"
diff --git a/crates/bevy_xr/Cargo.toml b/crates/bevy_xr/Cargo.toml
@@ -18,11 +18,12 @@ bevy_app = { path = "../bevy_app", version = "0.5.0" }
 bevy_core = { path = "../bevy_core", version = "0.5.0" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.5.0" }
 bevy_math = { path = "../bevy_math", version = "0.5.0" }
-bevy_reflect = { path = "../bevy_reflect", version = "0.5.0", features = ["bevy"] }
+bevy_reflect = { path = "../bevy_reflect", version = "0.5.0", features = [
+    "bevy",
+] }
 bevy_utils = { path = "../bevy_utils", version = "0.5.0" }
 
 # other
 downcast-rs = "1.2"
 serde = "1"
-# wgpu = { path = "../../../wgpu/wgpu" }
-wgpu = "0.9"
+wgpu = { git = "https://github.com/gfx-rs/wgpu" }
