feat: remove monado vulkan layers check for nvidia

fixes #208

dist/arch/PKGBUILD

@@ -33,7 +33,6 @@ makedepends=(
 )
 optdepends=(
     'libudev0-shim: steamvr_lh lighthouse driver support'
-    'monado-vulkan-layers-git: Vulkan layers for NVIDIA users'
 )
 provides=(envision)
 conflicts=(envision)

src/ui/about_dialog.rs

@@ -81,12 +81,6 @@ pub fn populate_debug_info(dialog: &adw::AboutDialog, vkinfo: Option<&VulkanInfo
                     .map(|i| i.gpu_names.join(", "))
                     .unwrap_or(UNKNOWN.into())
             ),
-            format!(
-                "Monado Vulkan Layers: {}",
-                vkinfo
-                    .map(|i| i.has_monado_vulkan_layers.to_string())
-                    .unwrap_or(UNKNOWN.into())
-            ),
             format!("Detected XR Devices: {}", {
                 let devs = PhysicalXRDevice::from_usb();
                 if devs.is_empty() {

src/ui/app.rs

@@ -998,7 +998,6 @@ impl AsyncComponent for App {
                     config: config.clone(),
                     selected_profile: selected_profile.clone(),
                     root_win: root.clone().into(),
-                    vkinfo: vkinfo.clone(),
                 })
                 .forward(sender.input_sender(), |message| match message {
                     MainViewOutMsg::DoStartStopXRService => Msg::DoStartStopXRService,

src/ui/main_view.rs

@@ -25,7 +25,6 @@ use crate::{
         file_utils::{get_writer, mount_has_nosuid},
         steamvr_utils::chaperone_info_exists,
     },
-    vulkaninfo::VulkanInfo,
     wivrn_dbus,
     xr_devices::XRDevice,
 };
@@ -75,8 +74,6 @@ pub struct MainView {
     #[tracker::do_not_track]
     profile_export_action: gtk::gio::SimpleAction,
     xrservice_ready: bool,
-    #[tracker::do_not_track]
-    vkinfo: Option<VulkanInfo>,
     wivrn_pairing_mode: bool,
     wivrn_pin: Option<String>,
     wivrn_supports_pairing: bool,
@@ -126,7 +123,6 @@ pub struct MainViewInit {
     pub config: Config,
     pub selected_profile: Profile,
     pub root_win: gtk::Window,
-    pub vkinfo: Option<VulkanInfo>,
 }
 
 impl MainView {
@@ -461,34 +457,6 @@ impl AsyncComponent for MainView {
                                 set_wrap_mode: gtk::pango::WrapMode::Word,
                             }
                         },
-                        gtk::Box {
-                            set_orientation: gtk::Orientation::Vertical,
-                            set_hexpand: true,
-                            set_vexpand: false,
-                            set_spacing: 12,
-                            add_css_class: "card",
-                            add_css_class: "padded",
-                            set_visible: model
-                                .vkinfo
-                                .as_ref()
-                                .is_some_and(
-                                    |i| i.has_nvidia_gpu && !i.has_monado_vulkan_layers
-                                ),
-                            warning_heading(),
-                            gtk::Label {
-                                set_label: concat!(
-                                    "An Nvidia GPU has been detected, but it ",
-                                    "seems you don't have the Monado Vulkan Layers ",
-                                    "installed on your system.\n\nInstall the ",
-                                    "Monado Vulkan Layers or your XR session will ",
-                                    "crash."
-                                ),
-                                add_css_class: "warning",
-                                set_xalign: 0.0,
-                                set_wrap: true,
-                                set_wrap_mode: gtk::pango::WrapMode::Word,
-                            }
-                        },
                         gtk::Box {
                             set_orientation: gtk::Orientation::Vertical,
                             set_hexpand: true,
@@ -1103,7 +1071,6 @@ impl AsyncComponent for MainView {
             xrservice_ready: false,
             profile_delete_action,
             profile_export_action,
-            vkinfo: init.vkinfo,
             wivrn_pairing_mode: false,
             wivrn_supports_pairing: false,
             wivrn_pin: None,

src/vulkaninfo.rs

@@ -5,12 +5,10 @@ use ash::{
 
 #[derive(Debug, Clone)]
 pub struct VulkanInfo {
-    pub has_nvidia_gpu: bool,
-    pub has_monado_vulkan_layers: bool,
     pub gpu_names: Vec<String>,
 }
 
-const NVIDIA_VENDOR_ID: u32 = 0x10de;
+// const NVIDIA_VENDOR_ID: u32 = 0x10de;
 
 impl VulkanInfo {
     /// # Safety
@@ -25,40 +23,19 @@ impl VulkanInfo {
                 None,
             )
         }?;
-        let mut has_nvidia_gpu = false;
-        let mut has_monado_vulkan_layers = false;
         let gpu_names = unsafe { instance.enumerate_physical_devices() }?
             .into_iter()
             .filter_map(|d| {
-                let props = unsafe { instance.get_physical_device_properties(d) };
-                if props.vendor_id == NVIDIA_VENDOR_ID {
-                    has_nvidia_gpu = true;
-                }
-                if !has_monado_vulkan_layers {
-                    has_monado_vulkan_layers =
-                        unsafe { instance.enumerate_device_layer_properties(d) }
-                            .ok()
-                            .map(|layerprops| {
-                                layerprops.iter().any(|lp| {
-                                    lp.layer_name_as_c_str().is_ok_and(|name| {
-                                        name.to_string_lossy()
-                                            == "VK_LAYER_MND_enable_timeline_semaphore"
-                                    })
-                                })
-                            })
-                            == Some(true);
-                }
-                props
-                    .device_name_as_c_str()
-                    .ok()
-                    .map(|cs| cs.to_string_lossy().to_string())
+                Some(
+                    unsafe { instance.get_physical_device_properties(d) }
+                        .device_name_as_c_str()
+                        .ok()?
+                        .to_string_lossy()
+                        .to_string(),
+                )
             })
             .collect();
         unsafe { instance.destroy_instance(None) };
-        Ok(Self {
-            gpu_names,
-            has_nvidia_gpu,
-            has_monado_vulkan_layers,
-        })
+        Ok(Self { gpu_names })
     }
 }