ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some bad string formats.

This commit is contained in:
gibbed 2020-04-08 13:01:58 -05:00 committed by Rick Gibbed
parent b37579fad2
commit c51cba080b
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xenia/apu/audio_system.cc
View File

@ -282,7 +282,8 @@ bool AudioSystem::Restore(ByteStream* stream) {
auto status = CreateDriver(id, client_semaphore, &driver); auto status = CreateDriver(id, client_semaphore, &driver);
if (XFAILED(status)) { if (XFAILED(status)) {
XELOGE( XELOGE(
"AudioSystem::Restore - Call to CreateDriver failed with status %.8X", "AudioSystem::Restore - Call to CreateDriver failed with status "
"{:08X}",
status); status);
return false; return false;
} }

2
src/xenia/gpu/vulkan/render_cache.cc
View File

@ -232,7 +232,7 @@ VkResult CachedTileView::Initialize(VkCommandBuffer command_buffer) {
device_->DbgSetObjectName( device_->DbgSetObjectName(
reinterpret_cast<uint64_t>(image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, reinterpret_cast<uint64_t>(image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT,
fmt::format("RT(d): {:#.8X} {:#.8X}({}) {:#.8X}({}) {} {} {}", fmt::format("RT(d): {:#08X} {:#08X}({}) {:#08X}({}) {} {} {}",
uint32_t(key.tile_offset), uint32_t(key.tile_width), uint32_t(key.tile_offset), uint32_t(key.tile_width),
uint32_t(key.tile_width), uint32_t(key.tile_height), uint32_t(key.tile_width), uint32_t(key.tile_height),
uint32_t(key.tile_height), uint32_t(key.color_or_depth), uint32_t(key.tile_height), uint32_t(key.color_or_depth),

4
src/xenia/gpu/vulkan/texture_cache.cc
View File

@ -522,7 +522,7 @@ TextureCache::Texture* TextureCache::DemandResolveTexture(
reinterpret_cast<uint64_t>(texture->image), reinterpret_cast<uint64_t>(texture->image),
VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT,
fmt::format( fmt::format(
"RT: {:#.8X} - {:#.8X} ({}, {})", texture_info.memory.base_address, "RT: {:#08X} - {:#08X} ({}, {})", texture_info.memory.base_address,
texture_info.memory.base_address + texture_info.memory.base_size, texture_info.memory.base_address + texture_info.memory.base_size,
texture_info.format_info()->name, texture_info.format_info()->name,
get_dimension_name(texture_info.dimension))); get_dimension_name(texture_info.dimension)));
@ -605,7 +605,7 @@ TextureCache::Texture* TextureCache::Demand(const TextureInfo& texture_info,
reinterpret_cast<uint64_t>(texture->image), reinterpret_cast<uint64_t>(texture->image),
VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT,
fmt::format( fmt::format(
"T: {:#.8X} - {:#.8X} ({}, {})", texture_info.memory.base_address, "T: {:#08X} - {:#08X} ({}, {})", texture_info.memory.base_address,
texture_info.memory.base_address + texture_info.memory.base_size, texture_info.memory.base_address + texture_info.memory.base_size,
texture_info.format_info()->name, texture_info.format_info()->name,
get_dimension_name(texture_info.dimension))); get_dimension_name(texture_info.dimension)));

2
src/xenia/kernel/xam/apps/xmp_app.cc
View File

@ -104,7 +104,7 @@ X_RESULT XmpApp::XMPDeleteTitlePlaylist(uint32_t playlist_handle) {
auto global_lock = global_critical_region_.Acquire(); auto global_lock = global_critical_region_.Acquire();
auto it = playlists_.find(playlist_handle); auto it = playlists_.find(playlist_handle);
if (it == playlists_.end()) { if (it == playlists_.end()) {
XELOGE("Playlist %.8X not found", playlist_handle); XELOGE("Playlist {:08X} not found", playlist_handle);
return X_ERROR_NOT_FOUND; return X_ERROR_NOT_FOUND;
} }
auto playlist = it->second; auto playlist = it->second;

5
src/xenia/kernel/xtimer.cc
View File

@ -60,8 +60,9 @@ X_STATUS XTimer::SetTimer(int64_t due_time, uint32_t period_ms,
uint64_t time = xe::Clock::QueryGuestSystemTime(); uint64_t time = xe::Clock::QueryGuestSystemTime();
uint32_t time_low = static_cast<uint32_t>(time); uint32_t time_low = static_cast<uint32_t>(time);
uint32_t time_high = static_cast<uint32_t>(time >> 32); uint32_t time_high = static_cast<uint32_t>(time >> 32);
XELOGI("XTimer enqueuing timer callback to %.8X(%.8X, %.8X, %.8X)", XELOGI(
callback_routine_, callback_routine_arg_, time_low, time_high); "XTimer enqueuing timer callback to {:08X}({:08X}, {:08X}, {:08X})",
callback_routine_, callback_routine_arg_, time_low, time_high);
callback_thread_->EnqueueApc(callback_routine_, callback_routine_arg_, callback_thread_->EnqueueApc(callback_routine_, callback_routine_arg_,
time_low, time_high); time_low, time_high);
}; };