Merge pull request #12154 from liamwhite/more-drivers

vulkan_device: add names for more driverID enumeration values
This commit is contained in:
liamwhite 2023-11-29 12:33:34 -05:00 committed by GitHub
commit df49795bcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 11 deletions

View File

@ -265,33 +265,33 @@ std::string Device::GetVendorName() const {
if (vendor_name == "Intel") { if (vendor_name == "Intel") {
// For Mesa, `Intel` is an overloaded vendor string that could mean crocus or iris. // For Mesa, `Intel` is an overloaded vendor string that could mean crocus or iris.
// Simply return `INTEL` for those as well as the Windows driver. // Simply return `INTEL` for those as well as the Windows driver.
return "INTEL"; return "Intel";
} }
if (vendor_name == "Intel Open Source Technology Center") { if (vendor_name == "Intel Open Source Technology Center") {
return "I965"; return "i965";
} }
if (vendor_name == "Mesa Project") { if (vendor_name == "Mesa Project") {
return "I915"; return "i915";
} }
if (vendor_name == "Mesa/X.org") { if (vendor_name == "Mesa/X.org") {
// This vendor string is overloaded between llvmpipe, softpipe, and virgl, so just return // This vendor string is overloaded between llvmpipe, softpipe, and virgl, so just return
// MESA instead of one of those driver names. // MESA instead of one of those driver names.
return "MESA"; return "Mesa";
} }
if (vendor_name == "AMD") { if (vendor_name == "AMD") {
return "RADEONSI"; return "RadeonSI";
} }
if (vendor_name == "nouveau") { if (vendor_name == "nouveau") {
return "NOUVEAU"; return "Nouveau";
} }
if (vendor_name == "X.Org") { if (vendor_name == "X.Org") {
return "R600"; return "R600";
} }
if (vendor_name == "Collabora Ltd") { if (vendor_name == "Collabora Ltd") {
return "ZINK"; return "Zink";
} }
if (vendor_name == "Intel Corporation") { if (vendor_name == "Intel Corporation") {
return "OPENSWR"; return "OpenSWR";
} }
if (vendor_name == "Microsoft Corporation") { if (vendor_name == "Microsoft Corporation") {
return "D3D12"; return "D3D12";
@ -300,7 +300,7 @@ std::string Device::GetVendorName() const {
// Mesa's tegra driver reports `NVIDIA`. Only present in this list because the default // Mesa's tegra driver reports `NVIDIA`. Only present in this list because the default
// strategy would have returned `NVIDIA` here for this driver, the same result as the // strategy would have returned `NVIDIA` here for this driver, the same result as the
// proprietary driver. // proprietary driver.
return "TEGRA"; return "Tegra";
} }
return vendor_name; return vendor_name;
} }

View File

@ -847,11 +847,41 @@ std::string Device::GetDriverName() const {
case VK_DRIVER_ID_NVIDIA_PROPRIETARY: case VK_DRIVER_ID_NVIDIA_PROPRIETARY:
return "NVIDIA"; return "NVIDIA";
case VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS: case VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS:
return "INTEL"; return "Intel";
case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA: case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA:
return "ANV"; return "ANV";
case VK_DRIVER_ID_IMAGINATION_PROPRIETARY:
return "PowerVR";
case VK_DRIVER_ID_QUALCOMM_PROPRIETARY:
return "Qualcomm";
case VK_DRIVER_ID_ARM_PROPRIETARY:
return "Mali";
case VK_DRIVER_ID_GOOGLE_SWIFTSHADER:
return "SwiftShader";
case VK_DRIVER_ID_BROADCOM_PROPRIETARY:
return "Broadcom";
case VK_DRIVER_ID_MESA_LLVMPIPE: case VK_DRIVER_ID_MESA_LLVMPIPE:
return "LAVAPIPE"; return "Lavapipe";
case VK_DRIVER_ID_MOLTENVK:
return "MoltenVK";
case VK_DRIVER_ID_VERISILICON_PROPRIETARY:
return "Vivante";
case VK_DRIVER_ID_MESA_TURNIP:
return "Turnip";
case VK_DRIVER_ID_MESA_V3DV:
return "V3DV";
case VK_DRIVER_ID_MESA_PANVK:
return "PanVK";
case VK_DRIVER_ID_MESA_VENUS:
return "Venus";
case VK_DRIVER_ID_MESA_DOZEN:
return "Dozen";
case VK_DRIVER_ID_MESA_NVK:
return "NVK";
case VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA:
return "PVR";
// case VK_DRIVER_ID_MESA_AGXV:
// return "Asahi";
default: default:
return properties.driver.driverName; return properties.driver.driverName;
} }