From b90ebdafd0380bacf4493e62db3ee0d584c14e20 Mon Sep 17 00:00:00 2001 From: "Bernhart, Bryan" Date: Wed, 19 Jul 2023 14:21:47 -0700 Subject: [PATCH] Depreciate RESIDENCY_HEAP_INFO::IsCachedForResidency Use RESIDENCY_HEAP_INFO::RESIDENCY_HEAP_STATUS to determine residency state. --- include/gpgmm_d3d12.h | 9 ++++----- src/gpgmm/d3d12/ResidencyHeapD3D12.cpp | 2 +- src/mvi/gpgmm_d3d12.cpp | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/gpgmm_d3d12.h b/include/gpgmm_d3d12.h index 4af57c64..34ada0d9 100644 --- a/include/gpgmm_d3d12.h +++ b/include/gpgmm_d3d12.h @@ -113,13 +113,12 @@ namespace gpgmm::d3d12 { */ uint64_t Alignment; - /** \brief Check if the heap currently locked for residency. - */ - bool IsLocked; + /** \brief Check if the heap is currently locked for residency. + + A locked heap means the heap is not eligable for eviction. - /** \brief Check if the heap is in a residency cache. */ - bool IsCachedForResidency; + bool IsLocked; /** \brief Check if the heap was made resident or not. */ diff --git a/src/gpgmm/d3d12/ResidencyHeapD3D12.cpp b/src/gpgmm/d3d12/ResidencyHeapD3D12.cpp index 0fef0b5e..89698733 100644 --- a/src/gpgmm/d3d12/ResidencyHeapD3D12.cpp +++ b/src/gpgmm/d3d12/ResidencyHeapD3D12.cpp @@ -231,7 +231,7 @@ namespace gpgmm::d3d12 { } RESIDENCY_HEAP_INFO ResidencyHeap::GetInfo() const { - return {GetSize(), GetAlignment(), IsResidencyLocked(), IsInList(), mState}; + return {GetSize(), GetAlignment(), IsResidencyLocked(), mState}; } HRESULT ResidencyHeap::SetDebugNameImpl(LPCWSTR name) { diff --git a/src/mvi/gpgmm_d3d12.cpp b/src/mvi/gpgmm_d3d12.cpp index 0f904b08..3156c958 100644 --- a/src/mvi/gpgmm_d3d12.cpp +++ b/src/mvi/gpgmm_d3d12.cpp @@ -94,7 +94,7 @@ namespace gpgmm::d3d12 { } RESIDENCY_HEAP_INFO ResidencyHeap::GetInfo() const { - return {GetSize(), GetAlignment(), false, false, RESIDENCY_HEAP_STATUS_UNKNOWN}; + return {GetSize(), GetAlignment(), false, RESIDENCY_HEAP_STATUS_UNKNOWN}; } HRESULT STDMETHODCALLTYPE ResidencyHeap::QueryInterface(REFIID riid, void** ppvObject) {