From 03b488772d08a421353afbe82c2413897048c25d Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 30 Jan 2019 13:13:46 +0100
Subject: [PATCH] [dxvk] Store device instead of adapter in memory allocator

---
 src/dxvk/dxvk_memory.cpp | 10 +++++-----
 src/dxvk/dxvk_memory.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dxvk/dxvk_memory.cpp b/src/dxvk/dxvk_memory.cpp
index e3d308e94..6dabf4335 100644
--- a/src/dxvk/dxvk_memory.cpp
+++ b/src/dxvk/dxvk_memory.cpp
@@ -154,9 +154,9 @@ namespace dxvk {
   
   DxvkMemoryAllocator::DxvkMemoryAllocator(const DxvkDevice* device)
   : m_vkd             (device->vkd()),
-    m_adapter         (device->adapter()),
-    m_devProps        (m_adapter->deviceProperties()),
-    m_memProps        (m_adapter->memoryProperties()),
+    m_device          (device),
+    m_devProps        (device->adapter()->deviceProperties()),
+    m_memProps        (device->adapter()->memoryProperties()),
     m_allowOvercommit (device->config().allowMemoryOvercommit) {
     for (uint32_t i = 0; i < m_memProps.memoryHeapCount; i++) {
       VkDeviceSize heapSize = m_memProps.memoryHeaps[i].size;
@@ -322,7 +322,7 @@ namespace dxvk {
     }
 
     type->heap->stats.memoryAllocated += size;
-    m_adapter->notifyHeapMemoryAlloc(type->heapId, size);
+    m_device->adapter()->notifyHeapMemoryAlloc(type->heapId, size);
     return result;
   }
 
@@ -362,7 +362,7 @@ namespace dxvk {
           DxvkDeviceMemory      memory) {
     m_vkd->vkFreeMemory(m_vkd->device(), memory.memHandle, nullptr);
     type->heap->stats.memoryAllocated -= memory.memSize;
-    m_adapter->notifyHeapMemoryFree(type->heapId, memory.memSize);
+    m_device->adapter()->notifyHeapMemoryFree(type->heapId, memory.memSize);
   }
 
 
diff --git a/src/dxvk/dxvk_memory.h b/src/dxvk/dxvk_memory.h
index bf949ec1d..061aaa0d4 100644
--- a/src/dxvk/dxvk_memory.h
+++ b/src/dxvk/dxvk_memory.h
@@ -262,7 +262,7 @@ namespace dxvk {
   private:
 
     const Rc<vk::DeviceFn>                 m_vkd;
-    const Rc<DxvkAdapter>                  m_adapter;
+    const DxvkDevice*                      m_device;
     const VkPhysicalDeviceProperties       m_devProps;
     const VkPhysicalDeviceMemoryProperties m_memProps;
     const bool                             m_allowOvercommit;