Skip to content

Remove MaxVideoMemoryBudget and Budget from ALLOCATOR_DESC. #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2022
Merged

Remove MaxVideoMemoryBudget and Budget from ALLOCATOR_DESC. #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/gpgmm/d3d12/JSONSerializerD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
7 changes: 0 additions & 7 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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.
Expand Down