From 7b4925dc453bb8130688c5aec8744e9a8550bf0f Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 31 Aug 2022 23:48:46 +0200
Subject: [PATCH] [dxvk] Fix potential sparse allocator lifetime issues

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

diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp
index 4820cf778..94cc0e528 100644
--- a/src/dxvk/dxvk_device.cpp
+++ b/src/dxvk/dxvk_device.cpp
@@ -217,7 +217,7 @@ namespace dxvk {
   
   
   Rc<DxvkSparsePageAllocator> DxvkDevice::createSparsePageAllocator() {
-    return new DxvkSparsePageAllocator(this, m_objects.memoryManager());
+    return new DxvkSparsePageAllocator(m_objects.memoryManager());
   }
 
 
diff --git a/src/dxvk/dxvk_sparse.cpp b/src/dxvk/dxvk_sparse.cpp
index c022b8063..373906edf 100644
--- a/src/dxvk/dxvk_sparse.cpp
+++ b/src/dxvk/dxvk_sparse.cpp
@@ -79,9 +79,8 @@ namespace dxvk {
 
 
   DxvkSparsePageAllocator::DxvkSparsePageAllocator(
-          DxvkDevice*           device,
           DxvkMemoryAllocator&  memoryAllocator)
-  : m_device(device), m_memory(&memoryAllocator) {
+  : m_memory(&memoryAllocator) {
 
   }
 
diff --git a/src/dxvk/dxvk_sparse.h b/src/dxvk/dxvk_sparse.h
index 158a2b5a7..2e8e5becb 100644
--- a/src/dxvk/dxvk_sparse.h
+++ b/src/dxvk/dxvk_sparse.h
@@ -271,7 +271,6 @@ namespace dxvk {
   public:
 
     DxvkSparsePageAllocator(
-            DxvkDevice*           device,
             DxvkMemoryAllocator&  memoryAllocator);
 
     ~DxvkSparsePageAllocator();
@@ -300,7 +299,6 @@ namespace dxvk {
 
   private:
 
-    DxvkDevice*                       m_device;
     DxvkMemoryAllocator*              m_memory;
 
     dxvk::mutex                       m_mutex;