From c263c1244865573181261244d5ffc78cec94028e Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Fri, 14 Jan 2022 13:45:07 +1000 Subject: [PATCH] HostDisplay: Add GetDriverInfo() --- pcsx2/Frontend/D3D11HostDisplay.cpp | 92 ++++++++++++++++++++++++++++ pcsx2/Frontend/D3D11HostDisplay.h | 1 + pcsx2/Frontend/OpenGLHostDisplay.cpp | 9 +++ pcsx2/Frontend/OpenGLHostDisplay.h | 1 + pcsx2/Frontend/VulkanHostDisplay.cpp | 25 ++++++++ pcsx2/Frontend/VulkanHostDisplay.h | 1 + pcsx2/HostDisplay.h | 1 + 7 files changed, 130 insertions(+) diff --git a/pcsx2/Frontend/D3D11HostDisplay.cpp b/pcsx2/Frontend/D3D11HostDisplay.cpp index 7555bcaba1..90bbdc9eca 100644 --- a/pcsx2/Frontend/D3D11HostDisplay.cpp +++ b/pcsx2/Frontend/D3D11HostDisplay.cpp @@ -524,6 +524,98 @@ void D3D11HostDisplay::DestroyRenderSurface() m_swap_chain.Reset(); } +static std::string GetDriverVersionFromLUID(const LUID& luid) +{ + std::string ret; + + HKEY hKey; + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\DirectX"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + DWORD max_key_len = 0, adapter_count = 0; + if (RegQueryInfoKey(hKey, nullptr, nullptr, nullptr, &adapter_count, &max_key_len, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS) + { + std::vector current_name(max_key_len + 1); + for (DWORD i = 0; i < adapter_count; ++i) + { + DWORD subKeyLength = static_cast(current_name.size()); + if (RegEnumKeyEx(hKey, i, current_name.data(), &subKeyLength, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS) + { + LUID current_luid = {}; + DWORD current_luid_size = sizeof(uint64_t); + if (RegGetValue(hKey, current_name.data(), _T("AdapterLuid"), RRF_RT_QWORD, nullptr, ¤t_luid, ¤t_luid_size) == ERROR_SUCCESS && + current_luid.HighPart == luid.HighPart && current_luid.LowPart == luid.LowPart) + { + LARGE_INTEGER driver_version = {}; + DWORD driver_version_size = sizeof(driver_version); + if (RegGetValue(hKey, current_name.data(), _T("DriverVersion"), RRF_RT_QWORD, nullptr, &driver_version, &driver_version_size) == ERROR_SUCCESS) + { + WORD nProduct = HIWORD(driver_version.HighPart); + WORD nVersion = LOWORD(driver_version.HighPart); + WORD nSubVersion = HIWORD(driver_version.LowPart); + WORD nBuild = LOWORD(driver_version.LowPart); + ret = StringUtil::StdStringFromFormat("%u.%u.%u.%u", nProduct, nVersion, nSubVersion, nBuild); + } + } + } + } + } + + RegCloseKey(hKey); + } + + return ret; +} + +std::string D3D11HostDisplay::GetDriverInfo() const +{ + std::string ret = "Unknown Feature Level"; + + static constexpr std::array, 4> feature_level_names = {{ + {D3D_FEATURE_LEVEL_10_0, "D3D_FEATURE_LEVEL_10_0"}, + {D3D_FEATURE_LEVEL_10_0, "D3D_FEATURE_LEVEL_10_1"}, + {D3D_FEATURE_LEVEL_11_0, "D3D_FEATURE_LEVEL_11_0"}, + {D3D_FEATURE_LEVEL_11_1, "D3D_FEATURE_LEVEL_11_1"}, + }}; + + const D3D_FEATURE_LEVEL fl = m_device->GetFeatureLevel(); + for (size_t i = 0; i < std::size(feature_level_names); i++) + { + if (fl == std::get<0>(feature_level_names[i])) + { + ret = std::get<1>(feature_level_names[i]); + break; + } + } + + ret += "\n"; + + ComPtr dxgi_dev; + if (SUCCEEDED(m_device.As(&dxgi_dev))) + { + ComPtr dxgi_adapter; + if (SUCCEEDED(dxgi_dev->GetAdapter(dxgi_adapter.ReleaseAndGetAddressOf()))) + { + DXGI_ADAPTER_DESC desc; + if (SUCCEEDED(dxgi_adapter->GetDesc(&desc))) + { + ret += StringUtil::StdStringFromFormat("VID: 0x%04X PID: 0x%04X\n", desc.VendorId, desc.DeviceId); + ret += StringUtil::WideStringToUTF8String(desc.Description); + ret += "\n"; + + const std::string driver_version(GetDriverVersionFromLUID(desc.AdapterLuid)); + if (!driver_version.empty()) + { + ret += "Driver Version: "; + ret += driver_version; + } + } + } + } + + return ret; +} + void D3D11HostDisplay::ResizeRenderWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) { if (!m_swap_chain) diff --git a/pcsx2/Frontend/D3D11HostDisplay.h b/pcsx2/Frontend/D3D11HostDisplay.h index ac3fdd8e5f..9da4c902af 100644 --- a/pcsx2/Frontend/D3D11HostDisplay.h +++ b/pcsx2/Frontend/D3D11HostDisplay.h @@ -56,6 +56,7 @@ public: bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; AdapterAndModeList GetAdapterAndModeList() override; void DestroyRenderSurface() override; + std::string GetDriverInfo() const override; std::unique_ptr CreateTexture(u32 width, u32 height, u32 layers, u32 levels, const void* data, u32 data_stride, bool dynamic = false) override; diff --git a/pcsx2/Frontend/OpenGLHostDisplay.cpp b/pcsx2/Frontend/OpenGLHostDisplay.cpp index 1d05762699..db36aa3956 100644 --- a/pcsx2/Frontend/OpenGLHostDisplay.cpp +++ b/pcsx2/Frontend/OpenGLHostDisplay.cpp @@ -319,6 +319,15 @@ void OpenGLHostDisplay::DestroyRenderSurface() Console.Error("Failed to switch to surfaceless"); } +std::string OpenGLHostDisplay::GetDriverInfo() const +{ + const char* gl_vendor = reinterpret_cast(glGetString(GL_VENDOR)); + const char* gl_renderer = reinterpret_cast(glGetString(GL_RENDERER)); + const char* gl_version = reinterpret_cast(glGetString(GL_VERSION)); + return StringUtil::StdStringFromFormat( + "%s Context:\n%s\n%s %s", m_gl_context->IsGLES() ? "OpenGL ES" : "OpenGL", gl_version, gl_vendor, gl_renderer); +} + bool OpenGLHostDisplay::CreateImGuiContext() { return ImGui_ImplOpenGL3_Init(GetGLSLVersionString()); diff --git a/pcsx2/Frontend/OpenGLHostDisplay.h b/pcsx2/Frontend/OpenGLHostDisplay.h index caabb70889..25c0ce49b7 100644 --- a/pcsx2/Frontend/OpenGLHostDisplay.h +++ b/pcsx2/Frontend/OpenGLHostDisplay.h @@ -50,6 +50,7 @@ public: bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; AdapterAndModeList GetAdapterAndModeList() override; void DestroyRenderSurface() override; + std::string GetDriverInfo() const override; std::unique_ptr CreateTexture(u32 width, u32 height, u32 layers, u32 levels, const void* data, u32 data_stride, bool dynamic) override; diff --git a/pcsx2/Frontend/VulkanHostDisplay.cpp b/pcsx2/Frontend/VulkanHostDisplay.cpp index 2dfd389fcd..eec6b88ded 100644 --- a/pcsx2/Frontend/VulkanHostDisplay.cpp +++ b/pcsx2/Frontend/VulkanHostDisplay.cpp @@ -127,6 +127,31 @@ void VulkanHostDisplay::DestroyRenderSurface() m_swap_chain.reset(); } +std::string VulkanHostDisplay::GetDriverInfo() const +{ + std::string ret; + const u32 version = g_vulkan_context->GetDeviceProperties().apiVersion; + if (g_vulkan_context->GetOptionalExtensions().vk_khr_driver_properties) + { + const VkPhysicalDeviceDriverProperties& props = g_vulkan_context->GetDeviceDriverProperties(); + ret = StringUtil::StdStringFromFormat( + "Vulkan %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), + props.conformanceVersion.major, props.conformanceVersion.minor, props.conformanceVersion.subminor, props.conformanceVersion.patch, + props.driverInfo, props.driverName, + g_vulkan_context->GetDeviceProperties().deviceName); + } + else + { + ret = StringUtil::StdStringFromFormat( + "Vulkan %u.%u.%u\n%s", + VK_API_VERSION_MAJOR(version), VK_API_VERSION_MINOR(version), VK_API_VERSION_PATCH(version), + g_vulkan_context->GetDeviceProperties().deviceName); + } + + return ret; +} + static bool UploadBufferToTexture(Vulkan::Texture* texture, u32 width, u32 height, const void* data, u32 data_stride) { const u32 tight_stride = Vulkan::Util::GetTexelSize(texture->GetFormat()) * width; diff --git a/pcsx2/Frontend/VulkanHostDisplay.h b/pcsx2/Frontend/VulkanHostDisplay.h index 7b74701b20..9f1963b823 100644 --- a/pcsx2/Frontend/VulkanHostDisplay.h +++ b/pcsx2/Frontend/VulkanHostDisplay.h @@ -41,6 +41,7 @@ public: bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; AdapterAndModeList GetAdapterAndModeList() override; void DestroyRenderSurface() override; + std::string GetDriverInfo() const override; std::unique_ptr CreateTexture(u32 width, u32 height, u32 layers, u32 levels, const void* data, u32 data_stride, bool dynamic = false) override; diff --git a/pcsx2/HostDisplay.h b/pcsx2/HostDisplay.h index 14f467ea7d..90414d7e45 100644 --- a/pcsx2/HostDisplay.h +++ b/pcsx2/HostDisplay.h @@ -108,6 +108,7 @@ public: virtual bool IsFullscreen() = 0; virtual bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) = 0; virtual AdapterAndModeList GetAdapterAndModeList() = 0; + virtual std::string GetDriverInfo() const = 0; /// Call when the window size changes externally to recreate any resources. virtual void ResizeRenderWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) = 0;