@@ -919,162 +919,6 @@ impl InnerDevice {
919919 }
920920}
921921
922- impl Device {
923- /*
924- fn dev_node(&self) -> DrmNode {
925- self.dev_node
926- }
927-
928- fn render_node(&self) -> DrmNode {
929- self.render_node
930- }
931-
932- fn output(&self, conn: &connector::Handle) -> Option<&Output> {
933- self.outputs.get(conn)
934- }
935-
936- fn drm_device_mut(&mut self) -> &mut DrmDevice {
937- self.drm.device_mut()
938- }
939-
940- fn gbm(&self) -> &GbmDevice<DrmDeviceFd> {
941- &self.gbm
942- }
943-
944- fn egl(&mut self) -> &mut Option<EGLInternals> {
945- &mut self.egl
946- }
947-
948- fn insert_surface(&mut self, crtc: crtc::Handle, surface: Surface) {
949- }
950-
951- fn in_use(&self, primary: Option<&DrmNode>) -> bool {
952- }
953-
954- fn add_leased_connector(
955- &mut self,
956- crtc: crtc::Handle,
957- conn: connector::Handle,
958- output: &Output,
959- ) {
960-
961- }
962-
963- fn update_surface_nodes<'b>(
964- &mut self,
965- used_devices: &HashSet<DrmNode>,
966- mut others: impl Iterator<Item = &'b Device>,
967- ) -> Result<()> {
968-
969- }
970- */
971- }
972-
973- impl < ' a > LockedDevice < ' a > {
974- /*
975- fn dev_node(&self) -> DrmNode {
976- *self.dev_node
977- }
978-
979- fn render_node(&self) -> DrmNode {
980- *self.render_node
981- }
982-
983- fn output(&self, conn: &connector::Handle) -> Option<&Output> {
984- self.outputs.get(conn)
985- }
986-
987- fn drm_device_mut(&mut self) -> &mut DrmDevice {
988- self.drm.device_mut()
989- }
990-
991- fn gbm(&self) -> &GbmDevice<DrmDeviceFd> {
992- self.gbm
993- }
994-
995- fn egl(&mut self) -> &mut Option<EGLInternals> {
996- self.egl
997- }
998-
999- fn insert_surface(&mut self, crtc: crtc::Handle, surface: Surface) {
1000- self.surfaces.insert(crtc, surface);
1001- }
1002-
1003- fn in_use(&self, primary: Option<&DrmNode>) -> bool {
1004- Some(self.render_node) == primary
1005- || !self.surfaces.is_empty()
1006- || !self.active_buffers.is_empty()
1007- }
1008-
1009- fn add_leased_connector(
1010- &mut self,
1011- crtc: crtc::Handle,
1012- conn: connector::Handle,
1013- output: &Output,
1014- ) {
1015- self.leased_connectors.push((conn, crtc));
1016- info!(
1017- "Connector {} is non-desktop, setting up for leasing",
1018- output.name()
1019- );
1020- if let Some(lease_state) = self.leasing_global.as_mut() {
1021- let physical = output.physical_properties();
1022- lease_state.add_connector::<State>(
1023- conn,
1024- output.name(),
1025- format!("{} {}", physical.make, physical.model),
1026- );
1027- }
1028- }
1029-
1030- fn update_surface_nodes<'b>(
1031- &mut self,
1032- used_devices: &HashSet<DrmNode>,
1033- mut others: impl Iterator<Item = &'b LockedDevice<'a>>,
1034- ) -> Result<()>
1035- where
1036- 'a: 'b,
1037- {
1038- for surface in self.surfaces.values_mut() {
1039- let known_nodes = surface.known_nodes().clone();
1040- for gone_device in known_nodes.difference(&used_devices) {
1041- surface.remove_node(*gone_device);
1042- }
1043- for new_device in used_devices.difference(&known_nodes) {
1044- let (render_node, egl, gbm) = if *self.render_node == *new_device {
1045- // we need to make sure to do partial borrows here, as device.surfaces is borrowed mutable
1046- (
1047- self.render_node,
1048- self.egl.as_ref().unwrap(),
1049- self.gbm.clone(),
1050- )
1051- } else {
1052- let device = others.find(|d| d.render_node == new_device).unwrap();
1053- (
1054- device.render_node,
1055- device.egl.as_ref().unwrap(),
1056- device.gbm.clone(),
1057- )
1058- };
1059-
1060- surface.add_node(
1061- *render_node,
1062- GbmAllocator::new(gbm, GbmBufferFlags::RENDERING | GbmBufferFlags::SCANOUT),
1063- EGLContext::new_shared_with_priority(
1064- &egl.display,
1065- &egl.context,
1066- ContextPriority::High,
1067- )
1068- .context("Failed to create shared EGL context")?,
1069- );
1070- }
1071- }
1072-
1073- Ok(())
1074- }
1075- */
1076- }
1077-
1078922fn create_output_for_conn ( drm : & mut DrmDevice , conn : connector:: Handle ) -> Result < Output > {
1079923 let conn_info = drm
1080924 . get_connector ( conn, false )
0 commit comments