From 0086ea03ef0333d8792d57f6adb57a1dc4b46137 Mon Sep 17 00:00:00 2001
From: Bryan Bernhart <bryan.bernhart@intel.com>
Date: Thu, 21 Apr 2022 10:40:18 -0700
Subject: [PATCH] Remove Heap::UpdateResidency in favor of
 ResourceAllocation::UpdateResidency.

---
 src/gpgmm/d3d12/HeapD3D12.cpp               | 5 -----
 src/gpgmm/d3d12/HeapD3D12.h                 | 2 --
 src/gpgmm/d3d12/ResourceAllocationD3D12.cpp | 5 ++---
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/gpgmm/d3d12/HeapD3D12.cpp b/src/gpgmm/d3d12/HeapD3D12.cpp
index fbd67da3e..3ca603019 100644
--- a/src/gpgmm/d3d12/HeapD3D12.cpp
+++ b/src/gpgmm/d3d12/HeapD3D12.cpp
@@ -17,7 +17,6 @@
 
 #include "gpgmm/Debug.h"
 #include "gpgmm/d3d12/JSONSerializerD3D12.h"
-#include "gpgmm/d3d12/ResidencySetD3D12.h"
 
 namespace gpgmm { namespace d3d12 {
     Heap::Heap(ComPtr<ID3D12Pageable> pageable,
@@ -92,10 +91,6 @@ namespace gpgmm { namespace d3d12 {
         return IsInList() || IsResidencyLocked();
     }
 
-    HRESULT Heap::UpdateResidency(ResidencySet* residencySet) {
-        return residencySet->Insert(this);
-    }
-
     HEAP_INFO Heap::GetInfo() const {
         return {GetSize(), IsResident(), mMemorySegmentGroup, GetRefCount(), GetPool(), GetHeap()};
     }
diff --git a/src/gpgmm/d3d12/HeapD3D12.h b/src/gpgmm/d3d12/HeapD3D12.h
index d2d88271e..dadad9350 100644
--- a/src/gpgmm/d3d12/HeapD3D12.h
+++ b/src/gpgmm/d3d12/HeapD3D12.h
@@ -54,8 +54,6 @@ namespace gpgmm { namespace d3d12 {
 
         ID3D12Heap* GetHeap() const;
 
-        HRESULT UpdateResidency(ResidencySet* residencySet);
-
         bool IsResident() const;
 
         // Testing only.
diff --git a/src/gpgmm/d3d12/ResourceAllocationD3D12.cpp b/src/gpgmm/d3d12/ResourceAllocationD3D12.cpp
index b32905cf6..fe20181e2 100644
--- a/src/gpgmm/d3d12/ResourceAllocationD3D12.cpp
+++ b/src/gpgmm/d3d12/ResourceAllocationD3D12.cpp
@@ -22,6 +22,7 @@
 #include "gpgmm/d3d12/HeapD3D12.h"
 #include "gpgmm/d3d12/JSONSerializerD3D12.h"
 #include "gpgmm/d3d12/ResidencyManagerD3D12.h"
+#include "gpgmm/d3d12/ResidencySetD3D12.h"
 
 #include <utility>
 
@@ -139,9 +140,7 @@ namespace gpgmm { namespace d3d12 {
     }
 
     HRESULT ResourceAllocation::UpdateResidency(ResidencySet* residencySet) const {
-        Heap* resourceHeap = GetMemory();
-        ASSERT(resourceHeap != nullptr);
-        return resourceHeap->UpdateResidency(residencySet);
+        return residencySet->Insert(GetMemory());
     }
 
     bool ResourceAllocation::IsResident() const {