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

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

diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp
index 27bc1f62..47b77048 100644
--- a/src/dxvk/dxvk_device.cpp
+++ b/src/dxvk/dxvk_device.cpp
@@ -26,7 +26,7 @@ namespace dxvk {
     m_metaCopyObjects   (new DxvkMetaCopyObjects    (this)),
     m_metaResolveObjects(new DxvkMetaResolveObjects (this)),
     m_metaMipGenObjects (new DxvkMetaMipGenObjects  (this)),
-    m_metaPackObjects   (new DxvkMetaPackObjects    (vkd)),
+    m_metaPackObjects   (new DxvkMetaPackObjects    (this)),
     m_unboundResources  (this),
     m_submissionQueue   (this) {
     auto queueFamilies = m_adapter->findQueueFamilies();
diff --git a/src/dxvk/dxvk_meta_copy.h b/src/dxvk/dxvk_meta_copy.h
index 688c3d8d..ec0f89d2 100644
--- a/src/dxvk/dxvk_meta_copy.h
+++ b/src/dxvk/dxvk_meta_copy.h
@@ -12,6 +12,8 @@
 
 namespace dxvk {
 
+  class DxvkDevice;
+
   /**
    * \brief Copy pipeline
    * 
diff --git a/src/dxvk/dxvk_meta_pack.cpp b/src/dxvk/dxvk_meta_pack.cpp
index 63584124..60b9c937 100644
--- a/src/dxvk/dxvk_meta_pack.cpp
+++ b/src/dxvk/dxvk_meta_pack.cpp
@@ -1,4 +1,5 @@
 #include "dxvk_meta_pack.h"
+#include "dxvk_device.h"
 
 #include <dxvk_pack_d24s8.h>
 #include <dxvk_pack_d32s8.h>
@@ -9,8 +10,8 @@
 
 namespace dxvk {
 
-  DxvkMetaPackObjects::DxvkMetaPackObjects(const Rc<vk::DeviceFn>& vkd)
-  : m_vkd             (vkd),
+  DxvkMetaPackObjects::DxvkMetaPackObjects(const DxvkDevice* device)
+  : m_vkd             (device->vkd()),
     m_sampler         (createSampler()),
     m_dsetLayoutPack  (createPackDescriptorSetLayout()),
     m_dsetLayoutUnpack(createUnpackDescriptorSetLayout()),
diff --git a/src/dxvk/dxvk_meta_pack.h b/src/dxvk/dxvk_meta_pack.h
index 66c9a302..290ec806 100644
--- a/src/dxvk/dxvk_meta_pack.h
+++ b/src/dxvk/dxvk_meta_pack.h
@@ -76,7 +76,7 @@ namespace dxvk {
 
   public:
 
-    DxvkMetaPackObjects(const Rc<vk::DeviceFn>& vkd);
+    DxvkMetaPackObjects(const DxvkDevice* device);
     ~DxvkMetaPackObjects();
 
     /**