Skip to content

Fix level from being correctly set in D3D12EventTraceReplay. #313

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
May 10, 2022
Merged

Fix level from being correctly set in D3D12EventTraceReplay. #313

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
21 changes: 18 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 @@ -91,6 +91,22 @@ namespace {
return (args.isMember("Description") && args.isMember("ID"));
}

D3D12_MESSAGE_SEVERITY GetMessageSeverity(gpgmm::LogSeverity logSeverity) {
switch (logSeverity) {
case gpgmm::LogSeverity::Error:
return D3D12_MESSAGE_SEVERITY_ERROR;
case gpgmm::LogSeverity::Warning:
return D3D12_MESSAGE_SEVERITY_WARNING;
case gpgmm::LogSeverity::Info:
return D3D12_MESSAGE_SEVERITY_INFO;
case gpgmm::LogSeverity::Debug:
return D3D12_MESSAGE_SEVERITY_MESSAGE;
default:
UNREACHABLE();
return D3D12_MESSAGE_SEVERITY_MESSAGE;
}
}

} // namespace

class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWithParams {
Expand Down Expand Up @@ -325,7 +341,7 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
allocatorDesc.RecordOptions.Flags |= ALLOCATOR_RECORD_FLAG_CAPTURE;
allocatorDesc.RecordOptions.TraceFile = traceFile.path;
allocatorDesc.RecordOptions.MinMessageLevel =
static_cast<D3D12_MESSAGE_SEVERITY>(envParams.EventMessageLevel);
GetMessageSeverity(envParams.EventMessageLevel);

// Keep recording across multiple playback iterations to ensure all
// events will be captured instead of overwritten per iteration.
Expand All @@ -335,8 +351,7 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
}
}

allocatorDesc.MinLogLevel =
static_cast<D3D12_MESSAGE_SEVERITY>(envParams.LogLevel);
allocatorDesc.MinLogLevel = GetMessageSeverity(envParams.LogLevel);

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