fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into d3d12

Browse Source
This commit is contained in:
gibbed
2019-05-01 21:00:21 -05:00
parent 08675ab65e bc9d82e2b0
commit fac37e7c50
18 changed files with 290 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/user_module.cc
View File

@@ -804,7 +804,7 @@ void UserModule::Dump() {
sb.AppendFormat("\n");
}
xe::LogLine(xe::LogLevel::LOG_LEVEL_INFO, 'i', sb.GetString());
xe::LogLine(xe::LogLevel::Info, 'i', sb.GetString());
}
} // namespace kernel

4
src/xenia/kernel/util/shim_utils.h
View File

@@ -451,10 +451,10 @@ void PrintKernelCall(cpu::Export* export_entry, const Tuple& params) {
AppendKernelCallParams(string_buffer, export_entry, params);
string_buffer.Append(')');
if (export_entry->tags & xe::cpu::ExportTag::kImportant) {
xe::LogLine(xe::LogLevel::LOG_LEVEL_INFO, 'i', string_buffer.GetString(),
xe::LogLine(xe::LogLevel::Info, 'i', string_buffer.GetString(),
string_buffer.length());
} else {
xe::LogLine(xe::LogLevel::LOG_LEVEL_DEBUG, 'd', string_buffer.GetString(),
xe::LogLine(xe::LogLevel::Debug, 'd', string_buffer.GetString(),
string_buffer.length());
}
}