vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #176 from Smithay/fix/anvil/udev_without_egl 

anvil: Fix udev build without egl
This commit is contained in:
Victor Brekenfeld 2020-04-11 14:43:33 +02:00 committed by GitHub
parent cd25b1d222 2b5c0448eb
commit e0fadac487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
anvil/src/udev.rs
View File

@ -371,9 +371,9 @@ impl<S: SessionNotifier, Data: 'static> UdevHandlerImpl<S, Data> {
let connector_infos: Vec<ConnectorInfo> = res_handles let connector_infos: Vec<ConnectorInfo> = res_handles
.connectors() .connectors()
.iter() .iter()
.map(|conn| device.resource_info::<ConnectorInfo>(*conn).unwrap()) .map(|conn| device.get_connector_info(*conn).unwrap())
.filter(|conn| conn.connection_state() == ConnectorState::Connected) .filter(|conn| conn.state() == ConnectorState::Connected)
.inspect(|conn| info!(logger, "Connected: {:?}", conn.connector_type())) .inspect(|conn| info!(logger, "Connected: {:?}", conn.interface()))
.collect(); .collect();
let mut backends = HashMap::new(); let mut backends = HashMap::new();
@ -383,7 +383,8 @@ impl<S: SessionNotifier, Data: 'static> UdevHandlerImpl<S, Data> {
let encoder_infos = connector_info let encoder_infos = connector_info
.encoders() .encoders()
.iter() .iter()
.flat_map(|encoder_handle| device.resource_info::<EncoderInfo>(*encoder_handle)) .filter_map(|e| *e)
.flat_map(|encoder_handle| device.get_encoder_info(encoder_handle))
.collect::<Vec<EncoderInfo>>(); .collect::<Vec<EncoderInfo>>();
for encoder_info in encoder_infos { for encoder_info in encoder_infos {
for crtc in res_handles.filter_crtcs(encoder_info.possible_crtcs()) { for crtc in res_handles.filter_crtcs(encoder_info.possible_crtcs()) {