From 31a3d405893e8ddcc37b761fc073ebd26fd253c2 Mon Sep 17 00:00:00 2001 From: Victor Berger Date: Wed, 18 Apr 2018 09:44:22 +0200 Subject: [PATCH] backend.drm: update doc examples --- src/backend/drm/mod.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/backend/drm/mod.rs b/src/backend/drm/mod.rs index 130cebf..dbce5bb 100644 --- a/src/backend/drm/mod.rs +++ b/src/backend/drm/mod.rs @@ -66,8 +66,6 @@ //! impl ControlDevice for Card {} //! //! # fn main() { -//! let (_display, mut event_loop) = wayland_server::create_display(); -//! //! // Open the drm device //! let mut options = OpenOptions::new(); //! options.read(true); @@ -139,7 +137,6 @@ //! # use std::time::Duration; //! use smithay::backend::drm::{DrmDevice, DrmBackend, DrmHandler, drm_device_bind}; //! use smithay::backend::graphics::egl::EGLGraphicsBackend; -//! use wayland_server::EventLoopHandle; //! # //! # #[derive(Debug)] //! # pub struct Card(File); @@ -153,7 +150,7 @@ //! # //! # fn main() { //! # -//! # let (_display, mut event_loop) = wayland_server::create_display(); +//! # let (_display, mut event_loop) = wayland_server::Display::new(); //! # //! # let mut options = OpenOptions::new(); //! # options.read(true); @@ -181,7 +178,6 @@ //! impl DrmHandler for MyDrmHandler { //! fn ready( //! &mut self, -//! _evlh: &mut EventLoopHandle, //! _device: &mut DrmDevice, //! _crtc: CrtcHandle, //! _frame: u32, @@ -192,7 +188,6 @@ //! } //! fn error( //! &mut self, -//! _evlh: &mut EventLoopHandle, //! device: &mut DrmDevice, //! error: DrmError) //! { @@ -203,7 +198,11 @@ //! // render something (like clear_color) //! backend.swap_buffers().unwrap(); //! -//! let _source = drm_device_bind(&mut event_loop, device, MyDrmHandler(backend)).map_err(|(err, _)| err).unwrap(); +//! let (_source, _device_rc) = drm_device_bind( +//! &event_loop.token(), +//! device, +//! MyDrmHandler(backend) +//! ).map_err(|(err, _)| err).unwrap(); //! //! event_loop.run().unwrap(); //! # }