Skip to content

Remove isUMA from ResourceAllocator. #509

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 12, 2022
Merged

Remove isUMA from ResourceAllocator. #509

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
1 change: 0 additions & 1 deletion src/gpgmm/d3d12/JSONSerializerD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ namespace gpgmm::d3d12 {
JSONDict dict;
dict.AddItem("Flags", desc.Flags);
dict.AddItem("RecordOptions", Serialize(desc.RecordOptions));
dict.AddItem("IsUMA", desc.IsUMA);
dict.AddItem("ResourceHeapTier", desc.ResourceHeapTier);
dict.AddItem("PreferredResourceHeapSize", desc.PreferredResourceHeapSize);
dict.AddItem("MaxResourceHeapSize", desc.MaxResourceHeapSize);
Expand Down
1 change: 0 additions & 1 deletion src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@ namespace gpgmm::d3d12 {
: mDevice(std::move(descriptor.Device)),
mResidencyManager(std::move(residencyManager)),
mCaps(std::move(caps)),
mIsUMA(descriptor.IsUMA),
mResourceHeapTier(descriptor.ResourceHeapTier),
mIsAlwaysCommitted(descriptor.Flags & ALLOCATOR_FLAG_ALWAYS_COMMITED),
mIsAlwaysInBudget(descriptor.Flags & ALLOCATOR_FLAG_ALWAYS_IN_BUDGET),
Expand Down
1 change: 0 additions & 1 deletion src/gpgmm/d3d12/ResourceAllocatorD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,6 @@ namespace gpgmm::d3d12 {

std::unique_ptr<Caps> mCaps;

const bool mIsUMA;
const D3D12_RESOURCE_HEAP_TIER mResourceHeapTier;
const bool mIsAlwaysCommitted;
const bool mIsAlwaysInBudget;
Expand Down
20 changes: 10 additions & 10 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 @@ -324,6 +324,16 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
residencyDesc.EvictBatchSize = snapshot["EvictBatchSize"].asUInt64();
residencyDesc.InitialFenceValue = snapshot["InitialFenceValue"].asUInt64();

if (envParams.LogLevel <= gpgmm::LogSeverity::Warning &&
residencyDesc.IsUMA != snapshot["IsUMA"].asBool() &&
iterationIndex == 0) {
gpgmm::WarningLog()
<< "Capture device does not match playback device (IsUMA: " +
std::to_string(snapshot["IsUMA"].asBool()) + " vs " +
std::to_string(residencyDesc.IsUMA) + ").";
GPGMM_SKIP_TEST_IF(envParams.IsSameCapsRequired);
}

if (envParams.CaptureEventMask != 0) {
residencyDesc.RecordOptions.Flags |=
static_cast<EVENT_RECORD_FLAGS_TYPE>(envParams.CaptureEventMask);
Expand Down Expand Up @@ -423,16 +433,6 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith

allocatorDesc.MinLogLevel = GetMessageSeverity(envParams.LogLevel);

if (envParams.LogLevel <= gpgmm::LogSeverity::Warning &&
allocatorDesc.IsUMA != snapshot["IsUMA"].asBool() &&
iterationIndex == 0) {
gpgmm::WarningLog()
<< "Capture device does not match playback device (IsUMA: " +
std::to_string(snapshot["IsUMA"].asBool()) + " vs " +
std::to_string(allocatorDesc.IsUMA) + ").";
GPGMM_SKIP_TEST_IF(envParams.IsSameCapsRequired);
}

if (envParams.LogLevel <= gpgmm::LogSeverity::Warning &&
allocatorDesc.ResourceHeapTier !=
snapshot["ResourceHeapTier"].asInt() &&
Expand Down