diff --git a/lact-daemon/src/server/gpu_controller/amd.rs b/lact-daemon/src/server/gpu_controller/amd.rs index e7d6518f..216b9179 100644 --- a/lact-daemon/src/server/gpu_controller/amd.rs +++ b/lact-daemon/src/server/gpu_controller/amd.rs @@ -620,7 +620,7 @@ impl GpuController for AmdGpuController { fn get_info(&self) -> LocalBoxFuture<'_, DeviceInfo> { Box::pin(async move { - let vulkan_info = get_vulkan_info(&self.common).await.unwrap_or_else(|err| { + let vulkan_instances = get_vulkan_info(&self.common).await.unwrap_or_else(|err| { warn!("could not load vulkan info: {err:#}"); vec![] }); @@ -633,7 +633,7 @@ impl GpuController for AmdGpuController { DeviceInfo { pci_info, - vulkan_info, + vulkan_instances, driver, vbios_version, link_info, diff --git a/lact-daemon/src/server/gpu_controller/intel.rs b/lact-daemon/src/server/gpu_controller/intel.rs index 69653007..1af5deaf 100644 --- a/lact-daemon/src/server/gpu_controller/intel.rs +++ b/lact-daemon/src/server/gpu_controller/intel.rs @@ -566,7 +566,7 @@ impl GpuController for IntelGpuController { fn get_info(&self) -> LocalBoxFuture<'_, DeviceInfo> { Box::pin(async move { - let vulkan_info = get_vulkan_info(&self.common).await.unwrap_or_else(|err| { + let vulkan_instances = get_vulkan_info(&self.common).await.unwrap_or_else(|err| { warn!("could not load vulkan info: {err:#}"); vec![] }); @@ -584,7 +584,7 @@ impl GpuController for IntelGpuController { DeviceInfo { pci_info: Some(self.common.pci_info.clone()), - vulkan_info, + vulkan_instances, driver: self.common.driver.clone(), vbios_version: None, link_info: LinkInfo::default(), diff --git a/lact-daemon/src/server/gpu_controller/nvidia.rs b/lact-daemon/src/server/gpu_controller/nvidia.rs index 19611264..391881c7 100644 --- a/lact-daemon/src/server/gpu_controller/nvidia.rs +++ b/lact-daemon/src/server/gpu_controller/nvidia.rs @@ -344,7 +344,7 @@ impl GpuController for NvidiaGpuController { fn get_info(&self) -> LocalBoxFuture<'_, DeviceInfo> { Box::pin(async move { - let vulkan_info = get_vulkan_info(&self.common).await.unwrap_or_else(|err| { + let vulkan_instances = get_vulkan_info(&self.common).await.unwrap_or_else(|err| { warn!("could not load vulkan info: {err:#}"); vec![] }); @@ -353,7 +353,7 @@ impl GpuController for NvidiaGpuController { DeviceInfo { pci_info: Some(self.common.pci_info.clone()), - vulkan_info, + vulkan_instances, driver: format!( "nvidia {}", self.nvml.sys_driver_version().unwrap_or_default() diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap index 7d118810..94641b29 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap @@ -24,7 +24,7 @@ expression: device_info "vendor_id": "174B" } }, - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap index f1329899..13e12eb3 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap @@ -25,7 +25,7 @@ expression: device_info } }, "vbios_version": "xxx-xxx-xxx", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5500xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5500xt.snap index bfa69010..c30730c2 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5500xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5500xt.snap @@ -101,7 +101,7 @@ expression: device_info } }, "vbios_version": "xxx-xxx-xxx", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap index ca7098b1..ed413f94 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap @@ -101,7 +101,7 @@ expression: device_info } }, "vbios_version": "113-D1990103-O09", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap index efa1f309..07d8911c 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap @@ -99,7 +99,7 @@ expression: device_info } }, "vbios_version": "113-1E3871U-O4C", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600.snap index 230542af..00dcbb86 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600.snap @@ -61,7 +61,7 @@ expression: device_info } }, "vbios_version": "113-D534-R66E", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap index a348a64c..9cd1e6a2 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap @@ -24,7 +24,7 @@ expression: device_info } }, "vbios_version": "113-23L86HMD2-D02", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap index 7345573a..108b6591 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap @@ -63,7 +63,7 @@ expression: device_info } }, "vbios_version": "113-D4121EXT-CO1", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7600s.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7600s.snap index 6b25c3e2..539f8101 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7600s.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7600s.snap @@ -24,7 +24,7 @@ expression: device_info } }, "vbios_version": "113-BRT112125.001", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap index f8c33347..efcff60c 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap @@ -24,7 +24,7 @@ expression: device_info } }, "vbios_version": "113-BRT125778.001", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7800xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7800xt.snap index b05c5220..962b7840 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7800xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7800xt.snap @@ -64,7 +64,7 @@ expression: device_info } }, "vbios_version": "113-EXT90249-100", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xtx.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xtx.snap index 9569b1f0..a4c9a98c 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xtx.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xtx.snap @@ -64,7 +64,7 @@ expression: device_info } }, "vbios_version": "113-D70401XT-N11", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070.snap index 844f042c..9eb3d79f 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070.snap @@ -63,7 +63,7 @@ expression: device_info } }, "vbios_version": "113-2E490TX-US2", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070xt.snap index b625222a..6e6c15d7 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx9070xt.snap @@ -63,7 +63,7 @@ expression: device_info } }, "vbios_version": "113-EXT109069-101", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vangogh.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vangogh.snap index 6d11be8d..df8b5964 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vangogh.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vangogh.snap @@ -24,7 +24,7 @@ expression: device_info } }, "vbios_version": "113-AMDAerithJ-005", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap index ab91e686..4b3bdc9c 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap @@ -105,7 +105,7 @@ expression: device_info } }, "vbios_version": "115-D050PIL-100", - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-i915.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-i915.snap index fdde9a4a..b45152d7 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-i915.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-i915.snap @@ -42,7 +42,7 @@ expression: device_info "vendor_id": "1849" } }, - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-xe.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-xe.snap index a4f13b86..f714ddca 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-xe.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__a380-xe.snap @@ -42,7 +42,7 @@ expression: device_info "vendor_id": "1849" } }, - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__b580.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__b580.snap index 0bd0447a..cb46ff2c 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__b580.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__b580.snap @@ -42,7 +42,7 @@ expression: device_info "vendor_id": "8086" } }, - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap index c4cf70b1..3db54b1e 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap @@ -41,7 +41,7 @@ expression: device_info "vendor_id": "17AA" } }, - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap index e717e4c0..4de3d87b 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap @@ -41,7 +41,7 @@ expression: device_info "vendor_id": "17AA" } }, - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap index 65472c45..2a26d87d 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap @@ -24,7 +24,7 @@ expression: device_info "vendor_id": "1462" } }, - "vulkan_info": [] + "vulkan_instances": [] }, "pci_info": { "device_pci_info": { diff --git a/lact-gui/src/app/pages/software_page.rs b/lact-gui/src/app/pages/software_page.rs index b0f288df..79ad7a93 100644 --- a/lact-gui/src/app/pages/software_page.rs +++ b/lact-gui/src/app/pages/software_page.rs @@ -261,7 +261,7 @@ impl relm4::SimpleComponent for SoftwarePage { SoftwarePageMsg::DeviceInfo(info) => { let mut vulkan_drivers = Vec::new(); - for info in &info.vulkan_info { + for info in &info.vulkan_instances { let name = format!( "{} ({})", info.device_name, @@ -306,7 +306,7 @@ impl SoftwarePage { .and_then(|idx| { self.device_info .as_ref() - .and_then(|info| info.vulkan_info.get(idx)) + .and_then(|info| info.vulkan_instances.get(idx)) }) } }