Port to d3d12 0.7 with ownership

wgpu-hal/Cargo.toml

@@ -97,7 +97,7 @@ gpu-allocator = { version = "0.22", default_features = false, features = ["d3d12
 hassle-rs = { version = "0.10", optional = true }
 
 winapi = { version = "0.3", features = ["profileapi", "libloaderapi", "windef", "winuser", "dcomp"] }
-d3d12 = { version = "0.6.0", git = "https://github.com/gfx-rs/d3d12-rs", rev = "b940b1d71", features = ["libloading"], optional = true }
+d3d12 = { version = "0.7", features = ["libloading"], optional = true }
 
 [target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies]
 # backend: Metal

wgpu-hal/src/auxil/dxgi/factory.rs

@@ -20,7 +20,7 @@ pub fn enumerate_adapters(factory: d3d12::DxgiFactory) -> Vec<d3d12::DxgiAdapter
         if let Some(factory6) = factory.as_factory6() {
             profiling::scope!("IDXGIFactory6::EnumAdapterByGpuPreference");
             // We're already at dxgi1.6, we can grab IDXGIAdapater4 directly
-            let mut adapter4 = d3d12::WeakPtr::<dxgi1_6::IDXGIAdapter4>::null();
+            let mut adapter4 = d3d12::ComPtr::<dxgi1_6::IDXGIAdapter4>::null();
             let hr = unsafe {
                 factory6.EnumAdapterByGpuPreference(
                     cur_index,
@@ -43,7 +43,7 @@ pub fn enumerate_adapters(factory: d3d12::DxgiFactory) -> Vec<d3d12::DxgiAdapter
         }
 
         profiling::scope!("IDXGIFactory1::EnumAdapters1");
-        let mut adapter1 = d3d12::WeakPtr::<dxgi::IDXGIAdapter1>::null();
+        let mut adapter1 = d3d12::ComPtr::<dxgi::IDXGIAdapter1>::null();
         let hr = unsafe { factory.EnumAdapters1(cur_index, adapter1.mut_self()) };
 
         if hr == winerror::DXGI_ERROR_NOT_FOUND {
@@ -60,7 +60,6 @@ pub fn enumerate_adapters(factory: d3d12::DxgiFactory) -> Vec<d3d12::DxgiAdapter
         unsafe {
             match adapter1.cast::<dxgi1_4::IDXGIAdapter3>().into_result() {
                 Ok(adapter3) => {
-                    adapter1.destroy();
                     adapters.push(d3d12::DxgiAdapter::Adapter3(adapter3));
                     continue;
                 }
@@ -74,7 +73,6 @@ pub fn enumerate_adapters(factory: d3d12::DxgiFactory) -> Vec<d3d12::DxgiAdapter
         unsafe {
             match adapter1.cast::<dxgi1_2::IDXGIAdapter2>().into_result() {
                 Ok(adapter2) => {
-                    adapter1.destroy();
                     adapters.push(d3d12::DxgiAdapter::Adapter2(adapter2));
                     continue;
                 }
@@ -107,8 +105,7 @@ pub fn create_factory(
         // we check for whether it exists first.
         match lib_dxgi.get_debug_interface1() {
             Ok(pair) => match pair.into_result() {
-                Ok(debug_controller) => {
-                    unsafe { debug_controller.destroy() };
+                Ok(_debug_controller) => {
                     factory_flags |= d3d12::FactoryCreationFlags::DEBUG;
                 }
                 Err(err) => {
@@ -151,9 +148,6 @@ pub fn create_factory(
         let factory6 = unsafe { factory4.cast::<dxgi1_6::IDXGIFactory6>().into_result() };
         match factory6 {
             Ok(factory6) => {
-                unsafe {
-                    factory4.destroy();
-                }
                 return Ok((lib_dxgi, d3d12::DxgiFactory::Factory6(factory6)));
             }
             // If we require factory6, hard error.
@@ -189,9 +183,6 @@ pub fn create_factory(
     let factory2 = unsafe { factory1.cast::<dxgi1_2::IDXGIFactory2>().into_result() };
     match factory2 {
         Ok(factory2) => {
-            unsafe {
-                factory1.destroy();
-            }
             return Ok((lib_dxgi, d3d12::DxgiFactory::Factory2(factory2)));
         }
         // If we require factory2, hard error.

wgpu-hal/src/dx11/instance.rs

@@ -38,7 +38,7 @@ impl crate::Instance<super::Api> for super::Instance {
     }
 
     unsafe fn enumerate_adapters(&self) -> Vec<crate::ExposedAdapter<super::Api>> {
-        let adapters = auxil::dxgi::factory::enumerate_adapters(self.factory);
+        let adapters = auxil::dxgi::factory::enumerate_adapters(self.factory.clone());
 
         adapters
             .into_iter()

wgpu-hal/src/dx11/library.rs

@@ -63,7 +63,7 @@ impl D3D11Lib {
             d3dcommon::D3D_FEATURE_LEVEL_9_1,
         ];
 
-        let mut device = d3d12::WeakPtr::<d3d11::ID3D11Device>::null();
+        let mut device = d3d12::ComPtr::<d3d11::ID3D11Device>::null();
         let mut feature_level: d3dcommon::D3D_FEATURE_LEVEL = 0;
 
         // We need to try this twice. If the first time fails due to E_INVALIDARG
@@ -117,7 +117,6 @@ impl D3D11Lib {
         unsafe {
             match device.cast::<d3d11_2::ID3D11Device2>().into_result() {
                 Ok(device2) => {
-                    device.destroy();
                     return Some((super::D3D11Device::Device2(device2), feature_level));
                 }
                 Err(hr) => {
@@ -130,7 +129,6 @@ impl D3D11Lib {
         unsafe {
             match device.cast::<d3d11_1::ID3D11Device1>().into_result() {
                 Ok(device1) => {
-                    device.destroy();
                     return Some((super::D3D11Device::Device1(device1), feature_level));
                 }
                 Err(hr) => {

wgpu-hal/src/dx11/mod.rs

@@ -57,7 +57,7 @@ unsafe impl Send for Adapter {}
 unsafe impl Sync for Adapter {}
 
 d3d12::weak_com_inheritance_chain! {
-    #[derive(Debug, Copy, Clone, PartialEq)]
+    #[derive(Debug, Clone, PartialEq)]
     enum D3D11Device {
         Device(d3d11::ID3D11Device), from_device, as_device, device;
         Device1(d3d11_1::ID3D11Device1), from_device1, as_device1, unwrap_device1;

wgpu-hal/src/dx12/adapter.rs

@@ -21,9 +21,6 @@ impl Drop for super::Adapter {
                 self.report_live_objects();
             }
         }
-        unsafe {
-            self.raw.destroy();
-        }
     }
 }
 
@@ -39,7 +36,6 @@ impl super::Adapter {
                     d3d12sdklayers::D3D12_RLDO_SUMMARY | d3d12sdklayers::D3D12_RLDO_IGNORE_INTERNAL,
                 )
             };
-            unsafe { debug_device.destroy() };
         }
     }
 
@@ -57,7 +53,7 @@ impl super::Adapter {
         // Create the device so that we can get the capabilities.
         let device = {
             profiling::scope!("ID3D12Device::create_device");
-            match library.create_device(*adapter, d3d12::FeatureLevel::L11_0) {
+            match library.create_device(&adapter, d3d12::FeatureLevel::L11_0) {
                 Ok(pair) => match pair.into_result() {
                     Ok(device) => device,
                     Err(err) => {
@@ -396,8 +392,8 @@ impl crate::Adapter<super::Api> for super::Adapter {
         };
 
         let device = super::Device::new(
-            self.device,
-            queue,
+            self.device.clone(),
+            queue.clone(),
             self.private_caps,
             &self.library,
             self.dx12_shader_compiler.clone(),