better error handling, better VK version handling

Author: float3

Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 keywords = ["vulkan", "neofetch", "gpu", "fetch"]
 license = "AGPL-3.0"
 repository = "https://github.com/float3/vkfetch-rs"
-version = "0.0.4"
+version = "0.0.5"
 name = "vkfetch-rs"
 categories = ["command-line-utilities"]
 readme = "README.md"

Cargo.toml

@@ -0,0 +1,11 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p cargo rustup openimagedenoise
+
+cargo update --workspace 
+cargo clippy --fix --allow-dirty --allow-staged --all-targets --all-features --workspace  -- -D warnings
+cargo fix --allow-dirty --allow-staged --all-targets --all-features --workspace 
+cargo fmt --all 
+cargo check --all-targets --all-features --workspace --release
+cargo test --all-targets --all-features --workspace --release 
+cargo build --all-targets --all-features --workspace --release
+cargo run --release

lint.sh

@@ -48,7 +48,13 @@ impl PhysicalDevice {
 
         let vendor_id = physical_device_properties.vendor_id;
 
-        let vendor = Vendor::from_vendor_id(vendor_id).unwrap();
+        let vendor = match Vendor::from_vendor_id(vendor_id) {
+            Some(vendor) => vendor,
+            None => {
+                eprintln!("Unknown vendor: {}", vendor_id);
+                panic!();
+            }
+        };
 
         let device_name =
             cstring_to_string(physical_device_properties.device_name_as_c_str().unwrap());

src/device.rs

@@ -66,31 +66,47 @@ fn get_device_info(device: PhysicalDevice) -> Vec<String> {
 }
 
 pub fn iterate_devices() {
-    let entry = unsafe { Entry::load().unwrap() };
-    let appinfo = vk::ApplicationInfo {
-        api_version: vk::API_VERSION_1_3,
-        ..Default::default()
+    let entry = match unsafe { Entry::load() } {
+        Ok(entry) => entry,
+        Err(e) => {
+            eprintln!("Failed to load entry: {:?}", e);
+            return;
+        }
     };
 
-    let create_info = vk::InstanceCreateInfo::default().application_info(&appinfo);
-    let instance = unsafe { entry.create_instance(&create_info, None).unwrap() };
-
-    let devices = unsafe { instance.enumerate_physical_devices().unwrap() };
-    for device in devices {
-        // let x = unsafe {
-        //     instance
-        //         .enumerate_device_extension_properties(device)
-        //         .unwrap()
-        // };
-        // for x in x {
-        //     println!(
-        //         "{:?}",
-        //         x.extension_name_as_c_str()
-        //             .unwrap()
-        //             .to_string_lossy()
-        //             .to_string()
-        //     );
-        // }
-        fetch_device(&instance, device);
+    let versions = [
+        vk::API_VERSION_1_3,
+        vk::API_VERSION_1_2,
+        vk::API_VERSION_1_1,
+        vk::API_VERSION_1_0,
+    ];
+
+    for api_version in versions {
+        let app_info = vk::ApplicationInfo {
+            api_version,
+            ..Default::default()
+        };
+        let create_info = vk::InstanceCreateInfo::default().application_info(&app_info);
+        let instance_result = unsafe { entry.create_instance(&create_info, None) };
+        match instance_result {
+            Ok(instance) => {
+                let devices_result = unsafe { instance.enumerate_physical_devices() };
+                match devices_result {
+                    Ok(devices) => {
+                        devices.into_iter().for_each(|device| {
+                            fetch_device(&instance, device);
+                        });
+                    }
+                    Err(e) => {
+                        eprintln!("Failed to enumerate physical devices: {:?}", e);
+                    }
+                }
+            }
+            Err(e) => {
+                eprintln!("Failed to create instance: {:?}", e);
+                continue;
+            }
+        }
+        break;
     }
 }

src/lib.rs

@@ -29,7 +29,7 @@ impl Vendor {
             Vendor::ARM => ARM,
             Vendor::Google => GOOGLE,
             Vendor::Intel => INTEL,
-            Vendor::Mesa => MESA,
+            Vendor::Mesa => VULKAN,
             Vendor::Nvidia => NVIDIA,
             Vendor::Unknown => VULKAN,
             _ => VULKAN,
@@ -58,7 +58,7 @@ impl Vendor {
             Vendor::ARM => ARM_STYLE,
             Vendor::Google => GOOGLE_STYLE,
             Vendor::Intel => INTEL_STYLE,
-            Vendor::Mesa => MESA_STYLE,
+            Vendor::Mesa => VULKAN_STYLE,
             Vendor::Nvidia => NVIDIA_STYLE,
             Vendor::Unknown => VULKAN_STYLE,
             _ => VULKAN_STYLE,