kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

metal: preserve front buffer if atomic commit fails

Browse source
This commit is contained in:
Julian Orth 2024-04-10 13:44:25 +02:00
parent 3cf1b227b6
commit fadec919e1
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -521,7 +521,7 @@ dependencies = [
[[package]] [[package]]
name = "jay-compositor" name = "jay-compositor"
version = "1.0.2" version = "1.0.3"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "jay-compositor" name = "jay-compositor"
version = "1.0.2" version = "1.0.3"
edition = "2021" edition = "2021"
build = "build/build.rs" build = "build/build.rs"
license = "GPL-3.0-only" license = "GPL-3.0-only"

5
src/backends/metal/video.rs
View file

@ -634,7 +634,6 @@ impl MetalConnector {
.perform_render_pass(pass) .perform_render_pass(pass)
.map_err(MetalError::RenderFrame)?; .map_err(MetalError::RenderFrame)?;
sync_file = buffer.copy_to_dev(sf)?; sync_file = buffer.copy_to_dev(sf)?;
self.next_buffer.fetch_add(1);
output.perform_screencopies(&buffer.render_tex, !render_hw_cursor, 0, 0, None); output.perform_screencopies(&buffer.render_tex, !render_hw_cursor, 0, 0, None);
fb = buffer.drm.clone(); fb = buffer.drm.clone();
} }
@ -787,6 +786,9 @@ impl MetalConnector {
Err(MetalError::Commit(e)) Err(MetalError::Commit(e))
} else { } else {
if let Some(fb) = new_fb { if let Some(fb) = new_fb {
if fb.direct_scanout_data.is_none() {
self.next_buffer.fetch_add(1);
}
self.next_framebuffer.set(Some(fb)); self.next_framebuffer.set(Some(fb));
} }
if cursor_swap_buffer { if cursor_swap_buffer {
@ -2407,6 +2409,7 @@ impl MetalBackend {
if let Some(old) = connector.buffers.set(Some(buffers)) { if let Some(old) = connector.buffers.set(Some(buffers)) {
old_buffers.push(old); old_buffers.push(old);
} }
connector.next_buffer.set(1);
connector.primary_plane.set(Some(primary_plane.clone())); connector.primary_plane.set(Some(primary_plane.clone()));
if let Some(cp) = &cursor_plane { if let Some(cp) = &cursor_plane {
cp.assigned.set(true); cp.assigned.set(true);