From b5f4a84a25d41afecef5acd2f59ed4889a12df2d Mon Sep 17 00:00:00 2001 From: Bryan Bernhart Date: Sat, 16 Jul 2022 09:40:15 -0700 Subject: [PATCH] Depreciate exported functions ResidencyManager::InsertHeap and ResidencyManager::Evict. --- src/gpgmm/d3d12/ResidencyManagerD3D12.h | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/gpgmm/d3d12/ResidencyManagerD3D12.h b/src/gpgmm/d3d12/ResidencyManagerD3D12.h index 1f23b0052..520e5d533 100644 --- a/src/gpgmm/d3d12/ResidencyManagerD3D12.h +++ b/src/gpgmm/d3d12/ResidencyManagerD3D12.h @@ -178,24 +178,6 @@ namespace gpgmm::d3d12 { */ HRESULT UnlockHeap(Heap* heap); - /** \brief Add or insert the specify heap. - - Inserting a heap means to have it managed by this residency manager. - - @param heap A pointer to the heap being managed. - */ - HRESULT InsertHeap(Heap* heap); - - /** \brief Evict memory per segment. - - Evicts until the budget is under the specified size. - - @param evictSizeInBytes Target size, in bytes, to be under budget. - @param memorySegmentGroup Memory segment to evict from. - */ - HRESULT Evict(uint64_t evictSizeInBytes, - const DXGI_MEMORY_SEGMENT_GROUP& memorySegmentGroup); - /** \brief Execute command lists using residency managed heaps. Submits an array of command lists and residency sets for the specified command queue. @@ -259,10 +241,15 @@ namespace gpgmm::d3d12 { ResidencyManager(const RESIDENCY_DESC& descriptor, std::unique_ptr fence); + HRESULT Evict(uint64_t evictSizeInBytes, + const DXGI_MEMORY_SEGMENT_GROUP& memorySegmentGroup); + HRESULT EvictInternal(uint64_t evictSizeInBytes, const DXGI_MEMORY_SEGMENT_GROUP& memorySegmentGroup, uint64_t* evictedSizeInBytesOut = nullptr); + HRESULT InsertHeap(Heap* heap); + HRESULT InsertHeapInternal(Heap* heap); const char* GetTypename() const;