From cfd7033e403bdd78e126cd6088d504ddea391406 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Tue, 30 Jul 2019 19:08:32 +0200
Subject: [PATCH] [dxvk] Pass DxvkDevice to DxvkRenderPassPool constructor

---
 src/dxvk/dxvk_device.cpp     | 2 +-
 src/dxvk/dxvk_renderpass.cpp | 5 +++--
 src/dxvk/dxvk_renderpass.h   | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp
index 87214c726..2b84190ad 100644
--- a/src/dxvk/dxvk_device.cpp
+++ b/src/dxvk/dxvk_device.cpp
@@ -18,7 +18,7 @@ namespace dxvk {
     m_properties        (adapter->deviceProperties()),
     m_perfHints         (getPerfHints()),
     m_memory            (new DxvkMemoryAllocator    (this)),
-    m_renderPassPool    (new DxvkRenderPassPool     (vkd)),
+    m_renderPassPool    (new DxvkRenderPassPool     (this)),
     m_pipelineManager   (new DxvkPipelineManager    (this, m_renderPassPool.ptr())),
     m_gpuEventPool      (new DxvkGpuEventPool       (this)),
     m_gpuQueryPool      (new DxvkGpuQueryPool       (this)),
diff --git a/src/dxvk/dxvk_renderpass.cpp b/src/dxvk/dxvk_renderpass.cpp
index 4bf4a67a0..b770a87b2 100644
--- a/src/dxvk/dxvk_renderpass.cpp
+++ b/src/dxvk/dxvk_renderpass.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 
+#include "dxvk_device.h"
 #include "dxvk_renderpass.h"
 
 namespace dxvk {
@@ -220,8 +221,8 @@ namespace dxvk {
   }
   
   
-  DxvkRenderPassPool::DxvkRenderPassPool(const Rc<vk::DeviceFn>& vkd)
-  : m_vkd(vkd) {
+  DxvkRenderPassPool::DxvkRenderPassPool(const DxvkDevice* device)
+  : m_vkd(device->vkd()) {
     
   }
   
diff --git a/src/dxvk/dxvk_renderpass.h b/src/dxvk/dxvk_renderpass.h
index 35a1d01f9..717b48a46 100644
--- a/src/dxvk/dxvk_renderpass.h
+++ b/src/dxvk/dxvk_renderpass.h
@@ -8,6 +8,8 @@
 #include "dxvk_limits.h"
 
 namespace dxvk {
+
+  class DxvkDevice;
   
   /**
    * \brief Format and layout for a render target
@@ -203,8 +205,7 @@ namespace dxvk {
     
   public:
     
-    DxvkRenderPassPool(
-      const Rc<vk::DeviceFn>& vkd);
+    DxvkRenderPassPool(const DxvkDevice* device);
     ~DxvkRenderPassPool();
     
     /**