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

gbm: update to gbm 0.5

This commit is contained in:
Victor Brekenfeld 2018-12-05 09:31:51 +01:00
parent 8fbce616a6
commit a3734da9da
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -22,7 +22,7 @@ libloading = "0.4.0"
wayland-client = { version = "0.21.1", features = ["egl"], optional = true } wayland-client = { version = "0.21.1", features = ["egl"], optional = true }
winit = { version = "0.18.0", optional = true } winit = { version = "0.18.0", optional = true }
drm = { version = "^0.3.4", optional = true } drm = { version = "^0.3.4", optional = true }
gbm = { version = "^0.4.0", optional = true, default-features = false, features = ["drm-support"] } gbm = { version = "^0.5.0", optional = true, default-features = false, features = ["drm-support"] }
glium = { version = "0.19.0", optional = true, default-features = false } glium = { version = "0.19.0", optional = true, default-features = false }
input = { version = "0.4.1", optional = true } input = { version = "0.4.1", optional = true }
udev = { version = "0.2.0", optional = true } udev = { version = "0.2.0", optional = true }

2
src/backend/drm/gbm/egl.rs
View File

@ -88,6 +88,6 @@ unsafe impl<D: RawDevice + 'static> NativeSurface for GbmSurface<D> {
} }
fn swap_buffers(&self) -> ::std::result::Result<(), SwapBuffersError> { fn swap_buffers(&self) -> ::std::result::Result<(), SwapBuffersError> {
self.page_flip() unsafe { self.page_flip() }
} }
} }

4
src/backend/drm/gbm/surface.rs
View File

@ -35,7 +35,7 @@ impl<D: RawDevice + 'static> GbmSurfaceInternal<D> {
// drop and release the old buffer // drop and release the old buffer
} }
pub fn page_flip(&self) -> ::std::result::Result<(), SwapBuffersError> { pub unsafe fn page_flip(&self) -> ::std::result::Result<(), SwapBuffersError> {
let res = { let res = {
let nb = self.next_buffer.take(); let nb = self.next_buffer.take();
let res = nb.is_some(); let res = nb.is_some();
@ -287,7 +287,7 @@ impl<D: RawDevice + 'static> GbmSurface<D> {
/// *Note*: This might trigger a full modeset on the underlying device, /// *Note*: This might trigger a full modeset on the underlying device,
/// potentially causing some flickering. In that case this operation is /// potentially causing some flickering. In that case this operation is
/// blocking until the crtc is in the desired state. /// blocking until the crtc is in the desired state.
pub fn page_flip(&self) -> ::std::result::Result<(), SwapBuffersError> { pub unsafe fn page_flip(&self) -> ::std::result::Result<(), SwapBuffersError> {
self.0.page_flip() self.0.page_flip()
} }