Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion src/gpgmm/d3d12/HeapD3D12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace gpgmm { namespace d3d12 {
}

const char* Heap::GetTypename() const {
return "GPUMemoryBlock";
return "Heap";
}

ComPtr<ID3D12Pageable> Heap::GetPageable() const {
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResourceAllocationD3D12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ namespace gpgmm { namespace d3d12 {
}

const char* ResourceAllocation::GetTypename() const {
return "GPUMemoryAllocation";
return "ResourceAllocation";
}

Heap* ResourceAllocation::GetMemory() const {
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ namespace gpgmm { namespace d3d12 {
}

const char* ResourceAllocator::GetTypename() const {
return "GPUMemoryAllocator";
return "ResourceAllocator";
}

void ResourceAllocator::Trim() {
Expand Down
6 changes: 3 additions & 3 deletions src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
default:
break;
}
} else if (event["name"].asString() == "GPUMemoryAllocation") {
} else if (event["name"].asString() == "ResourceAllocation") {
switch (*event["ph"].asCString()) {
case TRACE_EVENT_PHASE_SNAPSHOT_OBJECT: {
const std::string& allocationID = event["id"].asString();
Expand Down Expand Up @@ -284,7 +284,7 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
default:
break;
}
} else if (event["name"].asString() == "GPUMemoryAllocator") {
} else if (event["name"].asString() == "ResourceAllocator") {
switch (*event["ph"].asCString()) {
case TRACE_EVENT_PHASE_SNAPSHOT_OBJECT: {
const std::string& allocatorID = event["id"].asString();
Expand Down Expand Up @@ -393,7 +393,7 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
default:
break;
}
} else if (event["name"].asString() == "GPUMemoryBlock") {
} else if (event["name"].asString() == "Heap") {
switch (*event["ph"].asCString()) {
case TRACE_EVENT_PHASE_SNAPSHOT_OBJECT: {
const std::string& heapID = event["id"].asString();
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.