sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc: Get rid of format string for result logging

Browse Source
This commit is contained in:
Stenzek
2024-05-23 20:52:05 +10:00
parent 9f90f14c48
commit 792717e03e
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/vulkan_builders.cpp
View File

@ -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<int>(res),
VkResultToString(res));
Log::WriteFmt("VulkanDevice", func_name, LOGLEVEL_ERROR, "{} (0x{:08X}: {})", msg, static_cast<unsigned>(res),
VkResultToString(res));
}
Vulkan::DescriptorSetLayoutBuilder::DescriptorSetLayoutBuilder()

4
src/util/vulkan_builders.h
View File

@ -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
{

2
src/util/vulkan_device.cpp
View File

@ -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;
}