mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-09 22:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk: Improve logging of device names and driver versions

Browse Source
This commit is contained in:
kd-11 2018-08-29 15:49:19 +03:00 committed by kd-11
parent e23435a190
commit 815f4aa63b
4 changed files with 74 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View File

@ -528,7 +528,7 @@ VKGSRender::VKGSRender() : GSRender()
for (auto &gpu : gpus)
{
if (gpu.name() == adapter_name)
if (gpu.get_name() == adapter_name)
{
m_swapchain.reset(m_thread_context.createSwapChain(display, gpu));
gpu_found = true;

58
rpcs3/Emu/RSX/VK/VKHelpers.cpp
View File

@ -276,45 +276,35 @@ namespace vk
g_driver_vendor = driver_vendor::unknown;
g_heap_compatible_buffer_types = 0;
const auto gpu_name = g_current_renderer->gpu().name();
//Radeon fails to properly handle degenerate primitives if primitive restart is enabled
//One has to choose between using degenerate primitives or primitive restart to break up lists but not both
//Polaris and newer will crash with ERROR_DEVICE_LOST
//Older GCN will work okay most of the time but also occasionally draws garbage without reason (proprietary driver only)
if (gpu_name.find("Radeon") != std::string::npos || //Proprietary driver
gpu_name.find("POLARIS") != std::string::npos || //RADV POLARIS
gpu_name.find("VEGA") != std::string::npos) //RADV VEGA
const auto gpu_name = g_current_renderer->gpu().get_name();
switch (g_driver_vendor = g_current_renderer->gpu().get_driver_vendor())
{
g_drv_no_primitive_restart_flag = !g_cfg.video.vk.force_primitive_restart;
}
//Radeon proprietary driver does not properly handle fence reset and can segfault during vkResetFences
//Disable fence reset for proprietary driver and delete+initialize a new fence instead
if (gpu_name.find("Radeon") != std::string::npos)
{
g_driver_vendor = driver_vendor::AMD;
case driver_vendor::AMD:
// Radeon proprietary driver does not properly handle fence reset and can segfault during vkResetFences
// Disable fence reset for proprietary driver and delete+initialize a new fence instead
g_drv_disable_fence_reset = true;
}
//Nvidia cards are easily susceptible to NaN poisoning
if (gpu_name.find("NVIDIA") != std::string::npos || gpu_name.find("GeForce") != std::string::npos)
{
g_driver_vendor = driver_vendor::NVIDIA;
// Fall through
case driver_vendor::RADV:
// Radeon fails to properly handle degenerate primitives if primitive restart is enabled
// One has to choose between using degenerate primitives or primitive restart to break up lists but not both
// Polaris and newer will crash with ERROR_DEVICE_LOST
// Older GCN will work okay most of the time but also occasionally draws garbage without reason (proprietary driver only)
if (g_driver_vendor == driver_vendor::AMD ||
gpu_name.find("VEGA") != std::string::npos ||
gpu_name.find("POLARIS") != std::string::npos)
{
g_drv_no_primitive_restart_flag = !g_cfg.video.vk.force_primitive_restart;
}
break;
case driver_vendor::NVIDIA:
// Nvidia cards are easily susceptible to NaN poisoning
g_drv_sanitize_fp_values = true;
break;
default:
LOG_WARNING(RSX, "Unsupported device: %s", gpu_name);
}
if (g_driver_vendor == driver_vendor::unknown)
{
if (gpu_name.find("RADV") != std::string::npos)
{
g_driver_vendor = driver_vendor::RADV;
}
else
{
LOG_WARNING(RSX, "Unknown driver vendor for device '%s'", gpu_name);
}
}
LOG_NOTICE(RSX, "Vulkan: Renderer initialized on device '%s'", gpu_name);
{
// Buffer memory tests, only useful for portability on macOS

50
rpcs3/Emu/RSX/VK/VKHelpers.h
View File

@ -400,14 +400,60 @@ namespace vk
vkGetPhysicalDeviceProperties(pdev, &props);
vkGetPhysicalDeviceMemoryProperties(pdev, &memory_properties);
LOG_NOTICE(RSX, "Physical device intialized. GPU=%s, driver=%u", props.deviceName, props.driverVersion);
LOG_NOTICE(RSX, "Found vulkan-compatible GPU: '%s' running on driver %s", get_name(), get_driver_version());
}
std::string name() const
std::string get_name() const
{
return props.deviceName;
}
driver_vendor get_driver_vendor() const
{
const auto gpu_name = get_name();
if (gpu_name.find("Radeon") != std::string::npos)
{
return driver_vendor::AMD;
}
if (gpu_name.find("NVIDIA") != std::string::npos || gpu_name.find("GeForce") != std::string::npos)
{
return driver_vendor::NVIDIA;
}
if (gpu_name.find("RADV") != std::string::npos)
{
return driver_vendor::RADV;
}
return driver_vendor::unknown;
}
std::string get_driver_version() const
{
switch (get_driver_vendor())
{
case driver_vendor::NVIDIA:
{
// 10 + 8 + 8 + 6
const auto major_version = VK_VERSION_MAJOR(props.driverVersion);
const auto minor_version = (props.driverVersion >> 14) & 0xff;
const auto patch = (props.driverVersion >> 6) & 0xff;
const auto revision = (props.driverVersion & 0x3f);
return fmt::format("%u.%u.%u.%u", major_version, minor_version, patch, revision);
}
default:
{
// 10 + 10 + 12 (standard vulkan encoding created with VK_MAKE_VERSION)
return fmt::format("%u.%u.%u",
VK_VERSION_MAJOR(props.driverVersion),
VK_VERSION_MINOR(props.driverVersion),
VK_VERSION_PATCH(props.driverVersion));
}
}
}
uint32_t get_queue_count() const
{
if (queue_props.size())

2
rpcs3/rpcs3qt/emu_settings.cpp
View File

@ -162,7 +162,7 @@ emu_settings::Render_Creator::Render_Creator()
for (auto& gpu : gpus)
{
vulkanAdapters.append(qstr(gpu.name()));
vulkanAdapters.append(qstr(gpu.get_name()));
}
}
}