diff --git a/src/gpgmm/d3d12/JSONSerializerD3D12.cpp b/src/gpgmm/d3d12/JSONSerializerD3D12.cpp index ec2d74221..7195f552e 100644 --- a/src/gpgmm/d3d12/JSONSerializerD3D12.cpp +++ b/src/gpgmm/d3d12/JSONSerializerD3D12.cpp @@ -43,8 +43,6 @@ namespace gpgmm::d3d12 { dict.AddItem("ResourceHeapTier", desc.ResourceHeapTier); dict.AddItem("PreferredResourceHeapSize", desc.PreferredResourceHeapSize); dict.AddItem("MaxResourceHeapSize", desc.MaxResourceHeapSize); - dict.AddItem("MaxVideoMemoryBudget", desc.MaxVideoMemoryBudget); - dict.AddItem("Budget", desc.Budget); dict.AddItem("MemoryFragmentationLimit", desc.MemoryFragmentationLimit); return dict; } diff --git a/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp b/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp index 7213e3584..7cb3c2b4f 100644 --- a/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp +++ b/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp @@ -300,8 +300,6 @@ namespace gpgmm::d3d12 { RESIDENCY_DESC residencyDesc = {}; residencyDesc.Device = allocatorDescriptor.Device; residencyDesc.IsUMA = allocatorDescriptor.IsUMA; - residencyDesc.VideoMemoryBudget = allocatorDescriptor.MaxVideoMemoryBudget; - residencyDesc.Budget = allocatorDescriptor.Budget; ReturnIfFailed(allocatorDescriptor.Adapter.As(&residencyDesc.Adapter)); ReturnIfFailed( diff --git a/src/gpgmm/d3d12/ResourceAllocatorD3D12.h b/src/gpgmm/d3d12/ResourceAllocatorD3D12.h index 992c9fe8c..34089693b 100644 --- a/src/gpgmm/d3d12/ResourceAllocatorD3D12.h +++ b/src/gpgmm/d3d12/ResourceAllocatorD3D12.h @@ -351,13 +351,6 @@ namespace gpgmm::d3d12 { Optional parameter. When 0 is specified, the default of 1.25 is used (or 25% growth). */ double MemoryGrowthFactor; - - /* - * \deprecated Access by creating a ResidencyManager directly, not through CreateAllocator. - Will be removed in a future version of GPGMM. - */ - float MaxVideoMemoryBudget; - uint64_t Budget; }; /** \enum ALLOCATION_FLAGS diff --git a/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp b/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp index 2a27bed25..6d37a0eeb 100644 --- a/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp +++ b/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp @@ -321,6 +321,7 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith RESIDENCY_DESC residencyDesc = {}; residencyDesc.Device = mDevice; residencyDesc.Adapter = mAdapter; + residencyDesc.VideoMemoryBudget = snapshot["VideoMemoryBudget"].asFloat(); residencyDesc.Budget = snapshot["Budget"].asUInt64(); residencyDesc.EvictBatchSize = snapshot["EvictBatchSize"].asUInt64(); residencyDesc.InitialFenceValue = snapshot["InitialFenceValue"].asUInt64(); @@ -376,11 +377,10 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith snapshot["PreferredResourceHeapSize"].asUInt64(); allocatorDesc.MaxResourceHeapSize = snapshot["MaxResourceHeapSize"].asUInt64(); - allocatorDesc.MaxVideoMemoryBudget = - snapshot["MaxVideoMemoryBudget"].asFloat(); - allocatorDesc.Budget = snapshot["Budget"].asUInt64(); allocatorDesc.MemoryFragmentationLimit = snapshot["MemoryFragmentationLimit"].asDouble(); + allocatorDesc.MemoryGrowthFactor = + snapshot["MemoryGrowthFactor"].asDouble(); } else if (envParams.AllocatorProfile == AllocatorProfile::ALLOCATOR_PROFILE_MAX_PERFORMANCE) { // Any amount of (internal) fragmentation is acceptable.