bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Flush after wl_shm_pool destruction

Browse source 
Bit of a hacky fix for #12. It seems like the issue is caused by too
many wl_shm_pools being created and then destroyed before being flushed
to the parent compositor. Might negatively impact performance, but most
performant things shouldn't be using wl_shm anyway.
This commit is contained in:
Shawn Wallace 2024-06-11 23:30:58 -04:00
parent 017b683af9
commit 721fe5ee77
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/dispatch.rs
View file

@ -241,13 +241,13 @@ impl<C: XConnection> Dispatch<WlBuffer, ObjectKey> for ServerState<C> {
} }
} }
impl<C: XConnection> Dispatch<WlShmPool, ClientShmPool> for ServerState<C> { impl<C: XConnection> Dispatch<WlShmPool, client::wl_shm_pool::WlShmPool> for ServerState<C> {
fn request( fn request(
state: &mut Self, state: &mut Self,
_: &wayland_server::Client, _: &wayland_server::Client,
_: &WlShmPool, _: &WlShmPool,
request: <WlShmPool as Resource>::Request, request: <WlShmPool as Resource>::Request,
c_pool: &ClientShmPool, c_pool: &client::wl_shm_pool::WlShmPool,
_: &DisplayHandle, _: &DisplayHandle,
data_init: &mut wayland_server::DataInit<'_, Self>, data_init: &mut wayland_server::DataInit<'_, Self>,
) { ) {
@ -261,7 +261,7 @@ impl<C: XConnection> Dispatch<WlShmPool, ClientShmPool> for ServerState<C> {
format, format,
} => { } => {
state.objects.insert_with_key(|key| { state.objects.insert_with_key(|key| {
let client = c_pool.pool.create_buffer( let client = c_pool.create_buffer(
offset, offset,
width, width,
height, height,
@ -275,7 +275,8 @@ impl<C: XConnection> Dispatch<WlShmPool, ClientShmPool> for ServerState<C> {
}); });
} }
Request::<WlShmPool>::Destroy => { Request::<WlShmPool>::Destroy => {
c_pool.pool.destroy(); c_pool.destroy();
state.clientside.queue.flush().unwrap();
} }
other => warn!("unhandled shmpool request: {other:?}"), other => warn!("unhandled shmpool request: {other:?}"),
} }
@ -297,7 +298,6 @@ impl<C: XConnection> Dispatch<WlShm, ClientGlobalWrapper<client::wl_shm::WlShm>>
match request { match request {
Request::<WlShm>::CreatePool { id, fd, size } => { Request::<WlShm>::CreatePool { id, fd, size } => {
let c_pool = client.create_pool(fd.as_fd(), size, &state.qh, ()); let c_pool = client.create_pool(fd.as_fd(), size, &state.qh, ());
let c_pool = ClientShmPool { pool: c_pool, fd };
data_init.init(id, c_pool); data_init.init(id, c_pool);
} }
other => { other => {