diff --git a/wgpu-core/src/pipeline_cache.rs b/wgpu-core/src/pipeline_cache.rs index 8f4e65cfed1..ae495c9e0c7 100644 --- a/wgpu-core/src/pipeline_cache.rs +++ b/wgpu-core/src/pipeline_cache.rs @@ -319,6 +319,8 @@ mod tests { vendor: 0x0002_FEED, device: 0xFEFE_FEFE, device_type: wgt::DeviceType::Other, + device_pci_bus_id: String::new(), + device_uuid: String::new(), driver: String::new(), driver_info: String::new(), backend: wgt::Backend::Vulkan, diff --git a/wgpu-hal/src/gles/adapter.rs b/wgpu-hal/src/gles/adapter.rs index 806f5567ba2..066bc124f9d 100644 --- a/wgpu-hal/src/gles/adapter.rs +++ b/wgpu-hal/src/gles/adapter.rs @@ -187,6 +187,8 @@ impl super::Adapter { device: 0, device_type: inferred_device_type, driver: "".to_owned(), + device_pci_bus_id: String::new(), + device_uuid: String::new(), driver_info: version, backend: wgt::Backend::Gl, } diff --git a/wgpu-hal/src/metal/mod.rs b/wgpu-hal/src/metal/mod.rs index 00223b2f778..fe9f39c4218 100644 --- a/wgpu-hal/src/metal/mod.rs +++ b/wgpu-hal/src/metal/mod.rs @@ -156,6 +156,8 @@ impl crate::Instance for Instance { vendor: 0, device: 0, device_type: shared.private_caps.device_type(), + device_pci_bus_id: String::new(), + device_uuid: String::new(), driver: String::new(), driver_info: String::new(), backend: wgt::Backend::Metal, diff --git a/wgpu-hal/src/noop/mod.rs b/wgpu-hal/src/noop/mod.rs index 4d06e04331e..1484361b67d 100644 --- a/wgpu-hal/src/noop/mod.rs +++ b/wgpu-hal/src/noop/mod.rs @@ -137,6 +137,8 @@ pub fn adapter_info() -> wgt::AdapterInfo { vendor: 0, device: 0, device_type: wgt::DeviceType::Cpu, + device_pci_bus_id: String::new(), + device_uuid: String::new(), driver: String::from("wgpu"), driver_info: String::new(), backend: wgt::Backend::Noop, diff --git a/wgpu-hal/src/vulkan/adapter.rs b/wgpu-hal/src/vulkan/adapter.rs index 9c007bf6ef9..34d71464240 100644 --- a/wgpu-hal/src/vulkan/adapter.rs +++ b/wgpu-hal/src/vulkan/adapter.rs @@ -962,6 +962,14 @@ pub struct PhysicalDeviceProperties { /// `VK_EXT_mesh_shader` extension. mesh_shader: Option>, + /// Additional `vk::PhysicalDevice` properties from the + /// `VK_EXT_pci_bus_info` extension. + pci_bus_info: Option>, + + /// Additional `vk::PhysicalDevice` properties from the + /// `VK_EXT_physical_device_id` extension. + device_id: Option>, + /// The device API version. /// /// Which is the version of Vulkan supported for device-level functionality. @@ -1392,6 +1400,9 @@ impl super::InstanceShared { >= vk::API_VERSION_1_3 || capabilities.supports_extension(ext::subgroup_size_control::NAME); let supports_robustness2 = capabilities.supports_extension(ext::robustness2::NAME); + let supports_pci_bus_info = + capabilities.supports_extension(ext::pci_bus_info::NAME); + let supports_device_id = capabilities.device_api_version >= vk::API_VERSION_1_1; let supports_acceleration_structure = capabilities.supports_extension(khr::acceleration_structure::NAME); @@ -1448,6 +1459,20 @@ impl super::InstanceShared { properties2 = properties2.push_next(next); } + if supports_pci_bus_info { + let next = capabilities + .pci_bus_info + .insert(vk::PhysicalDevicePCIBusInfoPropertiesEXT::default()); + properties2 = properties2.push_next(next); + } + + if supports_device_id { + let next = capabilities + .device_id + .insert(vk::PhysicalDeviceIDProperties::default()); + properties2 = properties2.push_next(next); + } + if supports_mesh_shader { let next = capabilities .mesh_shader @@ -1662,6 +1687,27 @@ impl super::Instance { vk::PhysicalDeviceType::CPU => wgt::DeviceType::Cpu, _ => wgt::DeviceType::Other, }, + device_pci_bus_id: phd_capabilities.pci_bus_info + .filter(|info| info.pci_bus != 0 || info.pci_device != 0) + .map(|info| format!( + "{:04x}:{:02x}:{:02x}.{}", + info.pci_domain, + info.pci_bus, + info.pci_device, + info.pci_function + )) + .unwrap_or_default(), + device_uuid: phd_capabilities.device_id + .filter(|id| id.device_uuid != [0u8; 16]) + .map(|id| { + let u = id.device_uuid; + format!( + "{:02x}{:02x}{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}", + u[0], u[1], u[2], u[3], u[4], u[5], u[6], u[7], + u[8], u[9], u[10], u[11], u[12], u[13], u[14], u[15] + ) + }) + .unwrap_or_default(), driver: { phd_capabilities .driver diff --git a/wgpu-info/src/human.rs b/wgpu-info/src/human.rs index f0930bd0212..f9ec1859228 100644 --- a/wgpu-info/src/human.rs +++ b/wgpu-info/src/human.rs @@ -99,6 +99,9 @@ fn print_adapter(output: &mut impl io::Write, report: &AdapterReport, idx: usize writeln!(output, "\t Name: {}", info.name)?; writeln!(output, "\t VendorID: {:#X?}", info.vendor)?; writeln!(output, "\t DeviceID: {:#X?}", info.device)?; + writeln!(output, "\t DeviceUUID: {}", print_empty_string(&info.device_uuid))?; + writeln!(output, "\t DevicePCIBusId: {}", print_empty_string(&info.device_pci_bus_id))?; + writeln!(output, "\t DriverUUID: {}", print_empty_string(&info.driver))?; writeln!(output, "\t Type: {:?}", info.device_type)?; writeln!(output, "\t Driver: {}", print_empty_string(&info.driver))?; writeln!(output, "\t DriverInfo: {}", print_empty_string(&info.driver_info))?; diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs index f397bed3616..111667c37ef 100644 --- a/wgpu-types/src/lib.rs +++ b/wgpu-types/src/lib.rs @@ -1409,6 +1409,19 @@ pub struct AdapterInfo { pub device: u32, /// Type of device pub device_type: DeviceType, + /// [`Backend`]-specific PCI bus ID of the adapter. + /// + /// * For [`Backend::Vulkan`], [`VkPhysicalDevicePCIBusInfoPropertiesEXT`] is used, + /// if available, in the form `bus:device.function`, e.g. `0000:01:00.0`. + /// + /// [`VkPhysicalDevicePCIBusInfoPropertiesEXT`]: https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePCIBusInfoPropertiesEXT.html + pub device_pci_bus_id: String, + /// [`Backend`]-specific unique device identifier of the adapter. + /// + /// * For [`Backend::Vulkan`], [`VkPhysicalDeviceIDProperties`] is used, if available. + /// + /// [`VkPhysicalDeviceIDProperties`]: hhttps://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceIDProperties.html + pub device_uuid: String, /// Driver name pub driver: String, /// Driver info