mirror of
https://github.com/ilya-zlobintsev/LACT.git
synced 2026-08-19 01:14:43 -05:00
fix: test data
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -24,7 +24,7 @@ expression: device_info
|
||||
"vendor_id": "174B"
|
||||
}
|
||||
},
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -25,7 +25,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "xxx-xxx-xxx",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -101,7 +101,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "xxx-xxx-xxx",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -101,7 +101,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-D1990103-O09",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -99,7 +99,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-1E3871U-O4C",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -61,7 +61,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-D534-R66E",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -24,7 +24,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-23L86HMD2-D02",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -63,7 +63,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-D4121EXT-CO1",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -24,7 +24,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-BRT112125.001",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -24,7 +24,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-BRT125778.001",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -64,7 +64,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-EXT90249-100",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -64,7 +64,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-D70401XT-N11",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -63,7 +63,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-2E490TX-US2",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -63,7 +63,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-EXT109069-101",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -24,7 +24,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "113-AMDAerithJ-005",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -105,7 +105,7 @@ expression: device_info
|
||||
}
|
||||
},
|
||||
"vbios_version": "115-D050PIL-100",
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -42,7 +42,7 @@ expression: device_info
|
||||
"vendor_id": "1849"
|
||||
}
|
||||
},
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -42,7 +42,7 @@ expression: device_info
|
||||
"vendor_id": "1849"
|
||||
}
|
||||
},
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -42,7 +42,7 @@ expression: device_info
|
||||
"vendor_id": "8086"
|
||||
}
|
||||
},
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -41,7 +41,7 @@ expression: device_info
|
||||
"vendor_id": "17AA"
|
||||
}
|
||||
},
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -41,7 +41,7 @@ expression: device_info
|
||||
"vendor_id": "17AA"
|
||||
}
|
||||
},
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -24,7 +24,7 @@ expression: device_info
|
||||
"vendor_id": "1462"
|
||||
}
|
||||
},
|
||||
"vulkan_info": []
|
||||
"vulkan_instances": []
|
||||
},
|
||||
"pci_info": {
|
||||
"device_pci_info": {
|
||||
|
||||
@@ -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))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user