From f6bdb7bb638e219786ec5cace196544ac5e1f3f2 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 6 Apr 2019 12:31:20 +0200
Subject: [PATCH] [dxvk] Fix circular reference between DxvkDevice and
 DxvkGpuQueryPool

---
 src/dxvk/dxvk_gpu_query.cpp | 4 ++--
 src/dxvk/dxvk_gpu_query.h   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/dxvk/dxvk_gpu_query.cpp b/src/dxvk/dxvk_gpu_query.cpp
index 8fdd428b..bcac30af 100644
--- a/src/dxvk/dxvk_gpu_query.cpp
+++ b/src/dxvk/dxvk_gpu_query.cpp
@@ -155,7 +155,7 @@ namespace dxvk {
   
   
   DxvkGpuQueryAllocator::DxvkGpuQueryAllocator(
-    const Rc<DxvkDevice>&     device,
+          DxvkDevice*         device,
           VkQueryType         queryType,
           uint32_t            queryPoolSize)
   : m_device        (device),
@@ -254,7 +254,7 @@ namespace dxvk {
 
 
 
-  DxvkGpuQueryPool::DxvkGpuQueryPool(const Rc<DxvkDevice>& device)
+  DxvkGpuQueryPool::DxvkGpuQueryPool(DxvkDevice* device)
   : m_occlusion(device, VK_QUERY_TYPE_OCCLUSION,                     256),
     m_statistic(device, VK_QUERY_TYPE_PIPELINE_STATISTICS,           64),
     m_timestamp(device, VK_QUERY_TYPE_TIMESTAMP,                     64),
diff --git a/src/dxvk/dxvk_gpu_query.h b/src/dxvk/dxvk_gpu_query.h
index fccfeaf4..e466fad1 100644
--- a/src/dxvk/dxvk_gpu_query.h
+++ b/src/dxvk/dxvk_gpu_query.h
@@ -247,7 +247,7 @@ namespace dxvk {
   public:
 
     DxvkGpuQueryAllocator(
-      const Rc<DxvkDevice>&     device,
+            DxvkDevice*         device,
             VkQueryType         queryType,
             uint32_t            queryPoolSize);
     
@@ -275,7 +275,7 @@ namespace dxvk {
 
   private:
 
-    Rc<DxvkDevice>    m_device;
+    DxvkDevice*       m_device;
     Rc<vk::DeviceFn>  m_vkd;
     VkQueryType       m_queryType;
     uint32_t          m_queryPoolSize;
@@ -299,8 +299,7 @@ namespace dxvk {
 
   public:
 
-    DxvkGpuQueryPool(
-      const Rc<DxvkDevice>& device);
+    DxvkGpuQueryPool(DxvkDevice* device);
     
     ~DxvkGpuQueryPool();