diff --git a/src/core/bus.cpp b/src/core/bus.cpp index 170f3b877..a25d56c49 100644 --- a/src/core/bus.cpp +++ b/src/core/bus.cpp @@ -351,7 +351,7 @@ void Bus::AddTTYCharacter(char ch) { if (!s_tty_line_buffer.empty()) { - Log::Writef("TTY", "", LOGLEVEL_INFO, "\033[1;34m%s\033[0m", s_tty_line_buffer.c_str()); + Log::WriteFmt("TTY", "", LOGLEVEL_INFO, "\033[1;34m{}\033[0m", s_tty_line_buffer); #ifdef _DEBUG if (CPU::IsTraceEnabled()) CPU::WriteToExecutionLog("TTY: %s\n", s_tty_line_buffer.c_str()); diff --git a/src/util/vulkan_builders.cpp b/src/util/vulkan_builders.cpp index 825a717f0..be83c9951 100644 --- a/src/util/vulkan_builders.cpp +++ b/src/util/vulkan_builders.cpp @@ -103,15 +103,10 @@ const char* Vulkan::VkResultToString(VkResult res) } } -void Vulkan::LogVulkanResult(const char* func_name, VkResult res, const char* msg, ...) +void Vulkan::LogVulkanResult(const char* func_name, VkResult res, std::string_view msg) { - std::va_list ap; - va_start(ap, msg); - std::string real_msg = StringUtil::StdStringFromFormatV(msg, ap); - va_end(ap); - - Log::Writef("VulkanDevice", func_name, LOGLEVEL_ERROR, "%s (%d: %s)", real_msg.c_str(), static_cast(res), - VkResultToString(res)); + Log::WriteFmt("VulkanDevice", func_name, LOGLEVEL_ERROR, "{} (0x{:08X}: {})", msg, static_cast(res), + VkResultToString(res)); } Vulkan::DescriptorSetLayoutBuilder::DescriptorSetLayoutBuilder() diff --git a/src/util/vulkan_builders.h b/src/util/vulkan_builders.h index 202cbcaaf..4bb17c4de 100644 --- a/src/util/vulkan_builders.h +++ b/src/util/vulkan_builders.h @@ -16,14 +16,14 @@ #define ENABLE_VULKAN_DEBUG_OBJECTS 1 #endif -#define LOG_VULKAN_ERROR(res, ...) ::Vulkan::LogVulkanResult(__func__, res, __VA_ARGS__) +#define LOG_VULKAN_ERROR(res, msg) ::Vulkan::LogVulkanResult(__func__, res, msg) namespace Vulkan { // Adds a structure to a chain. void AddPointerToChain(void* head, const void* ptr); const char* VkResultToString(VkResult res); -void LogVulkanResult(const char* func_name, VkResult res, const char* msg, ...); +void LogVulkanResult(const char* func_name, VkResult res, std::string_view msg); class DescriptorSetLayoutBuilder { diff --git a/src/util/vulkan_device.cpp b/src/util/vulkan_device.cpp index 04befa17a..e564d7fb0 100644 --- a/src/util/vulkan_device.cpp +++ b/src/util/vulkan_device.cpp @@ -1199,7 +1199,7 @@ void VulkanDevice::WaitForCommandBufferCompletion(u32 index) } else if (res != VK_SUCCESS) { - LOG_VULKAN_ERROR(res, "vkWaitForFences() for cmdbuffer %u failed: ", index); + LOG_VULKAN_ERROR(res, TinyString::from_format("vkWaitForFences() for cmdbuffer {} failed: ", index)); m_last_submit_failed.store(true, std::memory_order_release); return; }