diff --git a/engine/include/XCEngine/RHI/D3D12/D3D12QueryHeap.h b/engine/include/XCEngine/RHI/D3D12/D3D12QueryHeap.h
index 6634c460..572a593c 100644
--- a/engine/include/XCEngine/RHI/D3D12/D3D12QueryHeap.h
+++ b/engine/include/XCEngine/RHI/D3D12/D3D12QueryHeap.h
@@ -4,6 +4,7 @@
 #include <wrl/client.h>
 #include <cstdint>
 
+#include "../DescriptorHeap.h"
 #include "D3D12Enum.h"
 
 using Microsoft::WRL::ComPtr;
@@ -11,7 +12,7 @@ using Microsoft::WRL::ComPtr;
 namespace XCEngine {
 namespace RHI {
 
-class D3D12QueryHeap {
+class D3D12QueryHeap : public IQueryHeap {
 public:
     D3D12QueryHeap();
     ~D3D12QueryHeap();
@@ -20,8 +21,10 @@ public:
     void Shutdown();
 
     ID3D12QueryHeap* GetQueryHeap() const { return m_queryHeap.Get(); }
-    QueryType GetType() const { return m_type; }
-    uint32_t GetCount() const { return m_count; }
+
+    void* GetNativeHandle() const override { return m_queryHeap.Get(); }
+    QueryType GetType() const override { return m_type; }
+    uint32_t GetCount() const override { return m_count; }
 
 private:
     ComPtr<ID3D12QueryHeap> m_queryHeap;