From 21dd7a8ebb23ab05373ab65558a7a47927f402f1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 9 Nov 2020 03:26:14 -0500 Subject: Vulkan: Migrate logging over to fmt Migrates the vulkan backend over to the fmt-capable logger. --- Source/Core/VideoBackends/Vulkan/ObjectCache.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Source/Core/VideoBackends/Vulkan/ObjectCache.cpp') diff --git a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp index 93b2144338..62c31eba06 100644 --- a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp @@ -543,7 +543,7 @@ bool ObjectCache::ValidatePipelineCache(const u8* data, size_t data_length) { if (data_length < sizeof(VK_PIPELINE_CACHE_HEADER)) { - ERROR_LOG(VIDEO, "Pipeline cache failed validation: Invalid header"); + ERROR_LOG_FMT(VIDEO, "Pipeline cache failed validation: Invalid header"); return false; } @@ -551,36 +551,36 @@ bool ObjectCache::ValidatePipelineCache(const u8* data, size_t data_length) std::memcpy(&header, data, sizeof(header)); if (header.header_length < sizeof(VK_PIPELINE_CACHE_HEADER)) { - ERROR_LOG(VIDEO, "Pipeline cache failed validation: Invalid header length"); + ERROR_LOG_FMT(VIDEO, "Pipeline cache failed validation: Invalid header length"); return false; } if (header.header_version != VK_PIPELINE_CACHE_HEADER_VERSION_ONE) { - ERROR_LOG(VIDEO, "Pipeline cache failed validation: Invalid header version"); + ERROR_LOG_FMT(VIDEO, "Pipeline cache failed validation: Invalid header version"); return false; } if (header.vendor_id != g_vulkan_context->GetDeviceProperties().vendorID) { - ERROR_LOG(VIDEO, - "Pipeline cache failed validation: Incorrect vendor ID (file: 0x%X, device: 0x%X)", - header.vendor_id, g_vulkan_context->GetDeviceProperties().vendorID); + ERROR_LOG_FMT( + VIDEO, "Pipeline cache failed validation: Incorrect vendor ID (file: {:#X}, device: {:#X})", + header.vendor_id, g_vulkan_context->GetDeviceProperties().vendorID); return false; } if (header.device_id != g_vulkan_context->GetDeviceProperties().deviceID) { - ERROR_LOG(VIDEO, - "Pipeline cache failed validation: Incorrect device ID (file: 0x%X, device: 0x%X)", - header.device_id, g_vulkan_context->GetDeviceProperties().deviceID); + ERROR_LOG_FMT( + VIDEO, "Pipeline cache failed validation: Incorrect device ID (file: {:#X}, device: {:#X})", + header.device_id, g_vulkan_context->GetDeviceProperties().deviceID); return false; } if (std::memcmp(header.uuid, g_vulkan_context->GetDeviceProperties().pipelineCacheUUID, VK_UUID_SIZE) != 0) { - ERROR_LOG(VIDEO, "Pipeline cache failed validation: Incorrect UUID"); + ERROR_LOG_FMT(VIDEO, "Pipeline cache failed validation: Incorrect UUID"); return false; } -- cgit v1.2.3