fixup! feat(dx12): enable GPU-based validation for DX12 backend

gfx-rs · Jan 30, 2024 · 2ba67bf · 2ba67bf
1 parent f652549
commit 2ba67bf
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/d3d12/src/debug.rs b/d3d12/src/debug.rs
@@ -1,12 +1,14 @@
-use crate::com::ComPtr;
+use crate::{com::ComPtr, weak_com_inheritance_chain};
 #[cfg(any(feature = "libloading", feature = "implicit-link"))]
 use winapi::Interface as _;
-use winapi::{
-    shared::{minwindef::TRUE, winerror::S_OK},
-    um::d3d12sdklayers,
-};
+use winapi::{shared::minwindef::TRUE, um::d3d12sdklayers};
 
-pub type Debug = ComPtr<d3d12sdklayers::ID3D12Debug>;
+weak_com_inheritance_chain! {
+    pub enum Debug {
+        Debug(d3d12sdklayers::ID3D12Debug), from_debug, as_debug, debug;
+        Debug1(d3d12sdklayers::ID3D12Debug1), from_debug1, as_debug1, unwrap_debug1;
+    }
+}
 
 #[cfg(feature = "libloading")]
 impl crate::D3D12Lib {
@@ -16,13 +18,13 @@ impl crate::D3D12Lib {
             *mut *mut winapi::ctypes::c_void,
         ) -> crate::HRESULT;
 
-        let mut debug = Debug::null();
+        let mut debug = ComPtr::<d3d12sdklayers::ID3D12Debug>::null();
         let hr = unsafe {
             let func: libloading::Symbol<Fun> = self.lib.get(b"D3D12GetDebugInterface")?;
             func(&d3d12sdklayers::ID3D12Debug::uuidof(), debug.mut_void())
         };
 
-        Ok((debug, hr))
+        Ok((Debug::Debug(debug), hr))
     }
 }
 
@@ -45,9 +47,8 @@ impl Debug {
     }
 
     pub fn enable_gpu_based_validation(&self) -> bool {
-        let (ptr, hr) = unsafe { self.cast::<d3d12sdklayers::ID3D12Debug1>() };
-        if hr == S_OK {
-            unsafe { ptr.SetEnableGPUBasedValidation(TRUE) };
+        if let Some(debug1) = self.as_debug1() {
+            unsafe { debug1.SetEnableGPUBasedValidation(TRUE) };
             true
         } else {
             false