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

metal: rename next_flip_nsec to next_vblank_nsec

Browse source
This commit is contained in:
Julian Orth 2024-09-27 08:10:23 +02:00
parent 1baa24adef
commit d45aaffdb3
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backends/metal/present.rs
View file

@ -106,7 +106,7 @@ impl MetalConnector {
let use_frame_scheduling = !self.try_async_flip(); let use_frame_scheduling = !self.try_async_flip();
if use_frame_scheduling { if use_frame_scheduling {
let next_present = self let next_present = self
.next_flip_nsec .next_vblank_nsec
.get() .get()
.saturating_sub(self.pre_commit_margin.get()) .saturating_sub(self.pre_commit_margin.get())
.saturating_sub(self.post_commit_margin.get()); .saturating_sub(self.post_commit_margin.get());

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

@ -445,7 +445,7 @@ pub struct MetalConnector {
pub has_damage: NumCell<u64>, pub has_damage: NumCell<u64>,
pub cursor_changed: Cell<bool>, pub cursor_changed: Cell<bool>,
pub cursor_damage: Cell<bool>, pub cursor_damage: Cell<bool>,
pub next_flip_nsec: Cell<u64>, pub next_vblank_nsec: Cell<u64>,
pub display: RefCell<ConnectorDisplayData>, pub display: RefCell<ConnectorDisplayData>,
@ -1085,7 +1085,7 @@ fn create_connector(
active_framebuffer: Default::default(), active_framebuffer: Default::default(),
next_framebuffer: Default::default(), next_framebuffer: Default::default(),
direct_scanout_active: Cell::new(false), direct_scanout_active: Cell::new(false),
next_flip_nsec: Cell::new(0), next_vblank_nsec: Cell::new(0),
tearing_requested: Cell::new(false), tearing_requested: Cell::new(false),
try_switch_format: Cell::new(false), try_switch_format: Cell::new(false),
version: Default::default(), version: Default::default(),
@ -1944,7 +1944,7 @@ impl MetalBackend {
self.state.vblank(connector.connector_id); self.state.vblank(connector.connector_id);
let dd = connector.display.borrow(); let dd = connector.display.borrow();
connector connector
.next_flip_nsec .next_vblank_nsec
.set(time_ns as u64 + dd.refresh as u64); .set(time_ns as u64 + dd.refresh as u64);
} }
@ -1993,7 +1993,9 @@ impl MetalBackend {
{ {
connector.schedule_present(); connector.schedule_present();
} }
connector.next_flip_nsec.set(time_ns + dd.refresh as u64); if connector.presentation_is_sync.get() {
connector.next_vblank_nsec.set(time_ns + dd.refresh as u64);
}
{ {
let mut flags = KIND_HW_COMPLETION; let mut flags = KIND_HW_COMPLETION;
if connector.presentation_is_sync.get() { if connector.presentation_is_sync.get() {