forked from gfx-rs/wgpu
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move vulkan drm implementation to its own module
- Loading branch information
Showing
3 changed files
with
146 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| use core::mem::MaybeUninit; | ||
| use std::{string::ToString, vec::Vec}; | ||
|
|
||
| use ash::{ext, khr, vk}; | ||
|
|
||
| impl super::Instance { | ||
| pub fn create_surface_from_drm( | ||
| &self, | ||
| fd: i32, | ||
| plane: u32, | ||
| connector_id: u32, | ||
| width: u32, | ||
| height: u32, | ||
| refresh_rate: u32, | ||
| ) -> Result<super::Surface, crate::InstanceError> { | ||
| if !self.shared.extensions.contains(&khr::display::NAME) { | ||
| return Err(crate::InstanceError::new( | ||
| "Vulkan driver does not support VK_KHR_display".to_string(), | ||
| )); | ||
| } | ||
|
|
||
| let drm_stat = { | ||
| let mut stat = MaybeUninit::<libc::stat>::uninit(); | ||
|
|
||
| if unsafe { libc::fstat(fd, stat.as_mut_ptr()) } != 0 { | ||
| return Err(crate::InstanceError::new( | ||
| "Unable to fstat drm device".to_string(), | ||
| )); | ||
| } | ||
|
|
||
| unsafe { stat.assume_init() } | ||
| }; | ||
|
|
||
| let raw_devices = match unsafe { self.shared.raw.enumerate_physical_devices() } { | ||
| Ok(devices) => devices, | ||
| Err(err) => { | ||
| log::error!("enumerate_adapters: {}", err); | ||
| Vec::new() | ||
| } | ||
| }; | ||
|
|
||
| let mut physical_device = None; | ||
|
|
||
| for device in raw_devices { | ||
| let properties2 = vk::PhysicalDeviceProperties2KHR::default(); | ||
|
|
||
| let mut drm_props = vk::PhysicalDeviceDrmPropertiesEXT::default(); | ||
| let mut properties2 = properties2.push_next(&mut drm_props); | ||
|
|
||
| unsafe { | ||
| self.shared | ||
| .raw | ||
| .get_physical_device_properties2(device, &mut properties2) | ||
| }; | ||
|
|
||
| /* | ||
| The makedev call is just bit manipulation to combine major and minor device numbers into a Unix device ID. | ||
| It doesn't perform any filesystem operations, only bitshifting. | ||
| See: https://github.com/rust-lang/libc/blob/268e1b3810ac07ed637d9005bc1a54e49218c958/src/unix/linux_like/linux/mod.rs#L6049 | ||
| We use the resulting device IDs to check if the Vulkan raw device from enumerate_physical_devices | ||
| matches the DRM device referred to by our file descriptor. | ||
| */ | ||
|
|
||
| let primary_devid = | ||
| libc::makedev(drm_props.primary_major as _, drm_props.primary_minor as _); | ||
| let render_devid = | ||
| libc::makedev(drm_props.render_major as _, drm_props.render_minor as _); | ||
|
|
||
| if primary_devid == drm_stat.st_rdev || render_devid == drm_stat.st_rdev { | ||
| physical_device = Some(device) | ||
| } | ||
| } | ||
|
|
||
| let physical_device = physical_device.ok_or(crate::InstanceError::new( | ||
| "Failed to find suitable drm device".to_string(), | ||
| ))?; | ||
|
|
||
| // FIXME: consider implementing this strategy on working vulkan drivers | ||
| // let displays = unsafe { | ||
| // display_instance | ||
| // .get_physical_device_display_properties(physical_device) | ||
| // .expect("Failed to get displays") | ||
| // }; | ||
|
|
||
| let acquire_drm_display_instance = | ||
| ext::acquire_drm_display::Instance::new(&self.shared.entry, &self.shared.raw); | ||
|
|
||
| let display = unsafe { | ||
| acquire_drm_display_instance | ||
| .get_drm_display(physical_device, fd, connector_id) | ||
| .expect("Failed to get drm display") | ||
| }; | ||
|
|
||
| unsafe { | ||
| acquire_drm_display_instance | ||
| .acquire_drm_display(physical_device, fd, display) | ||
| .expect("Failed to acquire drm display") | ||
| } | ||
|
|
||
| let display_instance = khr::display::Instance::new(&self.shared.entry, &self.shared.raw); | ||
|
|
||
| let modes = unsafe { | ||
| display_instance | ||
| .get_display_mode_properties(physical_device, display) | ||
| .expect("Failed to get display modes") | ||
| }; | ||
|
|
||
| let mut mode = None; | ||
|
|
||
| for current_mode in modes { | ||
| log::trace!( | ||
| "Comparing mode {}x{}@{} with {width}x{height}@{refresh_rate}", | ||
| current_mode.parameters.visible_region.width, | ||
| current_mode.parameters.visible_region.height, | ||
| current_mode.parameters.refresh_rate | ||
| ); | ||
| if current_mode.parameters.refresh_rate == refresh_rate | ||
| && current_mode.parameters.visible_region.width == width | ||
| && current_mode.parameters.visible_region.height == height | ||
| { | ||
| mode = Some(current_mode) | ||
| } | ||
| } | ||
|
|
||
| let mode = mode.ok_or(crate::InstanceError::new( | ||
| "Failed to find suitable display mode".to_string(), | ||
| ))?; | ||
|
|
||
| let create_info = vk::DisplaySurfaceCreateInfoKHR::default() | ||
| .display_mode(mode.display_mode) | ||
| .image_extent(mode.parameters.visible_region) | ||
| .transform(vk::SurfaceTransformFlagsKHR::IDENTITY) | ||
| .alpha_mode(vk::DisplayPlaneAlphaFlagsKHR::OPAQUE) | ||
| .plane_index(plane); | ||
|
|
||
| let surface = unsafe { display_instance.create_display_plane_surface(&create_info, None) } | ||
| .expect("Failed to create DRM surface"); | ||
|
|
||
| Ok(self.create_surface_from_vk_surface_khr(surface)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ mod adapter; | |
| mod command; | ||
| mod conv; | ||
| mod device; | ||
| mod drm; | ||
| mod instance; | ||
| mod sampler; | ||
|
|
||
|
|
||