diff --git a/Cargo.lock b/Cargo.lock index 005a3e36..94d06598 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3734,7 +3734,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=b401646560#b401646560c43cc65f31a0731efe6b963c9d3e61" +source = "git+https://github.com/smithay//smithay?rev=b77ef9a7ee#b77ef9a7ee655ad021004abdd4668c653d7543c7" dependencies = [ "appendlist", "ash", diff --git a/Cargo.toml b/Cargo.toml index 02227c8e..9c786ad0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,4 +80,4 @@ debug = true lto = "fat" [patch."https://github.com/Smithay/smithay.git"] -smithay = { git = "https://github.com/smithay//smithay", rev = "b401646560" } +smithay = { git = "https://github.com/smithay//smithay", rev = "b77ef9a7ee" } diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs index f857539e..1d391c56 100644 --- a/src/backend/kms/mod.rs +++ b/src/backend/kms/mod.rs @@ -33,7 +33,7 @@ use smithay::{ libinput::{LibinputInputBackend, LibinputSessionInterface}, renderer::{ buffer_dimensions, - damage::{Error as RenderError, OutputNoMode, RenderOutputResult}, + damage::{Error as RenderError, RenderOutputResult}, element::Element, gles::{GlesRenderbuffer, GlesTexture}, glow::GlowRenderer, @@ -47,7 +47,7 @@ use smithay::{ }, desktop::utils::OutputPresentationFeedback, input::Seat, - output::{Mode as OutputMode, Output, PhysicalProperties, Subpixel}, + output::{Mode as OutputMode, Output, OutputNoMode, PhysicalProperties, Subpixel}, reexports::{ calloop::{ timer::{TimeoutAction, Timer}, diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs index da4c8718..4998c9f0 100644 --- a/src/backend/render/mod.rs +++ b/src/backend/render/mod.rs @@ -43,7 +43,7 @@ use smithay::{ drm::DrmNode, renderer::{ buffer_dimensions, - damage::{Error as RenderError, OutputDamageTracker, OutputNoMode, RenderOutputResult}, + damage::{Error as RenderError, OutputDamageTracker, RenderOutputResult}, element::{ surface::render_elements_from_surface_tree, utils::{Relocate, RelocateRenderElement}, @@ -60,7 +60,7 @@ use smithay::{ }, }, desktop::{layer_map_for_output, PopupManager}, - output::Output, + output::{Output, OutputNoMode}, utils::{IsAlive, Logical, Point, Rectangle, Scale}, wayland::{ dmabuf::get_dmabuf, diff --git a/src/wayland/handlers/screencopy.rs b/src/wayland/handlers/screencopy.rs index 27cda5f1..bc8a04fc 100644 --- a/src/wayland/handlers/screencopy.rs +++ b/src/wayland/handlers/screencopy.rs @@ -17,14 +17,14 @@ use smithay::{ egl::EGLDevice, renderer::{ buffer_dimensions, buffer_type, - damage::{Error as DTError, OutputDamageTracker, OutputNoMode, RenderOutputResult}, + damage::{Error as DTError, OutputDamageTracker, RenderOutputResult}, element::{surface::WaylandSurfaceRenderElement, AsRenderElements, RenderElement}, gles::{Capability, GlesError, GlesRenderbuffer, GlesRenderer}, Bind, Blit, BufferType, ExportMem, ImportAll, ImportMem, Offscreen, Renderer, }, }, desktop::{layer_map_for_output, space::SpaceElement}, - output::Output, + output::{Output, OutputNoMode}, reexports::wayland_server::{ protocol::{wl_buffer::WlBuffer, wl_shm::Format as ShmFormat, wl_surface::WlSurface}, Resource,