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

VulkanHostDisplay: Improve Vulkan version reporting

This commit is contained in:
Connor McLaughlin 2022-02-13 19:40:21 +10:00 committed by lightningterror
parent 0702692746
commit 3f30c2bda2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/Frontend/VulkanHostDisplay.cpp
View File

@ -138,13 +138,15 @@ void VulkanHostDisplay::DestroyRenderSurface()
std::string VulkanHostDisplay::GetDriverInfo() const std::string VulkanHostDisplay::GetDriverInfo() const
{ {
std::string ret; std::string ret;
const u32 version = g_vulkan_context->GetDeviceProperties().apiVersion; const u32 api_version = g_vulkan_context->GetDeviceProperties().apiVersion;
const u32 driver_version = g_vulkan_context->GetDeviceProperties().driverVersion;
if (g_vulkan_context->GetOptionalExtensions().vk_khr_driver_properties) if (g_vulkan_context->GetOptionalExtensions().vk_khr_driver_properties)
{ {
const VkPhysicalDeviceDriverProperties& props = g_vulkan_context->GetDeviceDriverProperties(); const VkPhysicalDeviceDriverProperties& props = g_vulkan_context->GetDeviceDriverProperties();
ret = StringUtil::StdStringFromFormat( ret = StringUtil::StdStringFromFormat(
"Vulkan %u.%u.%u\nConformance Version %u.%u.%u.%u\n%s\n%s\n%s", "Driver %u.%u.%u\nVulkan %u.%u.%u\nConformance Version %u.%u.%u.%u\n%s\n%s\n%s",
VK_API_VERSION_MAJOR(version), VK_API_VERSION_MINOR(version), VK_API_VERSION_PATCH(version), VK_VERSION_MAJOR(driver_version), VK_VERSION_MINOR(driver_version), VK_VERSION_PATCH(driver_version),
VK_API_VERSION_MAJOR(api_version), VK_API_VERSION_MINOR(api_version), VK_API_VERSION_PATCH(api_version),
props.conformanceVersion.major, props.conformanceVersion.minor, props.conformanceVersion.subminor, props.conformanceVersion.patch, props.conformanceVersion.major, props.conformanceVersion.minor, props.conformanceVersion.subminor, props.conformanceVersion.patch,
props.driverInfo, props.driverName, props.driverInfo, props.driverName,
g_vulkan_context->GetDeviceProperties().deviceName); g_vulkan_context->GetDeviceProperties().deviceName);
@ -152,8 +154,9 @@ std::string VulkanHostDisplay::GetDriverInfo() const
else else
{ {
ret = StringUtil::StdStringFromFormat( ret = StringUtil::StdStringFromFormat(
"Vulkan %u.%u.%u\n%s", "Driver %u.%u.%u\nVulkan %u.%u.%u\n%s",
VK_API_VERSION_MAJOR(version), VK_API_VERSION_MINOR(version), VK_API_VERSION_PATCH(version), VK_VERSION_MAJOR(driver_version), VK_VERSION_MINOR(driver_version), VK_VERSION_PATCH(driver_version),
VK_API_VERSION_MAJOR(api_version), VK_API_VERSION_MINOR(api_version), VK_API_VERSION_PATCH(api_version),
g_vulkan_context->GetDeviceProperties().deviceName); g_vulkan_context->GetDeviceProperties().deviceName);
} }