From c51cba080b4ecbbc2b4c55e1338a630b363b1843 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Wed, 8 Apr 2020 13:01:58 -0500
Subject: [PATCH] Fix some bad string formats.

---
 src/xenia/apu/audio_system.cc         | 3 ++-
 src/xenia/gpu/vulkan/render_cache.cc  | 2 +-
 src/xenia/gpu/vulkan/texture_cache.cc | 4 ++--
 src/xenia/kernel/xam/apps/xmp_app.cc  | 2 +-
 src/xenia/kernel/xtimer.cc            | 5 +++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/xenia/apu/audio_system.cc b/src/xenia/apu/audio_system.cc
index befbca4d6..67bf34ae3 100644
--- a/src/xenia/apu/audio_system.cc
+++ b/src/xenia/apu/audio_system.cc
@@ -282,7 +282,8 @@ bool AudioSystem::Restore(ByteStream* stream) {
     auto status = CreateDriver(id, client_semaphore, &driver);
     if (XFAILED(status)) {
       XELOGE(
-          "AudioSystem::Restore - Call to CreateDriver failed with status %.8X",
+          "AudioSystem::Restore - Call to CreateDriver failed with status "
+          "{:08X}",
           status);
       return false;
     }
diff --git a/src/xenia/gpu/vulkan/render_cache.cc b/src/xenia/gpu/vulkan/render_cache.cc
index 1c6b4a04a..8e85f60c4 100644
--- a/src/xenia/gpu/vulkan/render_cache.cc
+++ b/src/xenia/gpu/vulkan/render_cache.cc
@@ -232,7 +232,7 @@ VkResult CachedTileView::Initialize(VkCommandBuffer command_buffer) {
 
   device_->DbgSetObjectName(
       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_width), uint32_t(key.tile_height),
                   uint32_t(key.tile_height), uint32_t(key.color_or_depth),
diff --git a/src/xenia/gpu/vulkan/texture_cache.cc b/src/xenia/gpu/vulkan/texture_cache.cc
index 00e456423..903b778c4 100644
--- a/src/xenia/gpu/vulkan/texture_cache.cc
+++ b/src/xenia/gpu/vulkan/texture_cache.cc
@@ -522,7 +522,7 @@ TextureCache::Texture* TextureCache::DemandResolveTexture(
       reinterpret_cast<uint64_t>(texture->image),
       VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT,
       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.format_info()->name,
           get_dimension_name(texture_info.dimension)));
@@ -605,7 +605,7 @@ TextureCache::Texture* TextureCache::Demand(const TextureInfo& texture_info,
       reinterpret_cast<uint64_t>(texture->image),
       VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT,
       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.format_info()->name,
           get_dimension_name(texture_info.dimension)));
diff --git a/src/xenia/kernel/xam/apps/xmp_app.cc b/src/xenia/kernel/xam/apps/xmp_app.cc
index 217fbf908..33ff77aea 100644
--- a/src/xenia/kernel/xam/apps/xmp_app.cc
+++ b/src/xenia/kernel/xam/apps/xmp_app.cc
@@ -104,7 +104,7 @@ X_RESULT XmpApp::XMPDeleteTitlePlaylist(uint32_t playlist_handle) {
   auto global_lock = global_critical_region_.Acquire();
   auto it = playlists_.find(playlist_handle);
   if (it == playlists_.end()) {
-    XELOGE("Playlist %.8X not found", playlist_handle);
+    XELOGE("Playlist {:08X} not found", playlist_handle);
     return X_ERROR_NOT_FOUND;
   }
   auto playlist = it->second;
diff --git a/src/xenia/kernel/xtimer.cc b/src/xenia/kernel/xtimer.cc
index b44e80a50..df8bda2e2 100644
--- a/src/xenia/kernel/xtimer.cc
+++ b/src/xenia/kernel/xtimer.cc
@@ -60,8 +60,9 @@ X_STATUS XTimer::SetTimer(int64_t due_time, uint32_t period_ms,
       uint64_t time = xe::Clock::QueryGuestSystemTime();
       uint32_t time_low = static_cast<uint32_t>(time);
       uint32_t time_high = static_cast<uint32_t>(time >> 32);
-      XELOGI("XTimer enqueuing timer callback to %.8X(%.8X, %.8X, %.8X)",
-             callback_routine_, callback_routine_arg_, time_low, time_high);
+      XELOGI(
+          "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_,
                                    time_low, time_high);
     };