From e8aba2810ad1caa1aa2e6bd79cc61135de6324fe Mon Sep 17 00:00:00 2001 From: yvt Date: Wed, 26 Apr 2023 00:02:50 +0900 Subject: [PATCH] refactor(graphics-server): remove `backend::XousDisplay::update` It's no longer necessary because the `minifb` backend now automatically calls `minifb::Window::update_with_buffer` in a dedicated thread. --- services/graphics-server/src/backend/betrusted.rs | 3 --- services/graphics-server/src/backend/minifb.rs | 4 ---- services/graphics-server/src/main.rs | 9 --------- 3 files changed, 16 deletions(-) diff --git a/services/graphics-server/src/backend/betrusted.rs b/services/graphics-server/src/backend/betrusted.rs index 120c87571..7b741c087 100644 --- a/services/graphics-server/src/backend/betrusted.rs +++ b/services/graphics-server/src/backend/betrusted.rs @@ -212,9 +212,6 @@ impl XousDisplay { log::trace!("redraw {}/{}", busy_count, dirty_count); } - // note: this API is used by emulation, don't remove calls to it - pub fn update(&mut self) {} - pub fn native_buffer(&mut self) -> &mut [u32; FB_SIZE] { unsafe { &mut *(self.fb.as_mut_ptr() as *mut [u32; FB_SIZE]) } } diff --git a/services/graphics-server/src/backend/minifb.rs b/services/graphics-server/src/backend/minifb.rs index d1c8debf3..426b9ace3 100644 --- a/services/graphics-server/src/backend/minifb.rs +++ b/services/graphics-server/src/backend/minifb.rs @@ -74,7 +74,6 @@ impl XousDisplay { self.emulated_buffer[FB_WIDTH_WORDS * 32..] .copy_from_slice(&self.srfb[FB_WIDTH_WORDS * 32..]); self.redraw(); - self.update(); } pub fn screen_size(&self) -> Point { @@ -99,9 +98,6 @@ impl XousDisplay { self.emulated_to_native(); } - // TODO: `update` is no longer needed for emulation; remove it - pub fn update(&mut self) {} - fn emulated_to_native(&mut self) { const DEVBOOT_LINE: usize = 7; let mut native_buffer = self.native_buffer.lock().unwrap(); diff --git a/services/graphics-server/src/main.rs b/services/graphics-server/src/main.rs index a0bb3181f..9f9e53921 100644 --- a/services/graphics-server/src/main.rs +++ b/services/graphics-server/src/main.rs @@ -392,7 +392,6 @@ fn wrapped_main() -> ! { } Some(Opcode::Flush) => { log::trace!("***gfx flush*** redraw##"); - display.update(); display.redraw(); } Some(Opcode::Clear) => { @@ -455,12 +454,10 @@ fn wrapped_main() -> ! { }), Some(Opcode::DrawSleepScreen) => msg_scalar_unpack!(msg, _, _, _, _, { display.blit_screen(&logo::LOGO_MAP); - display.update(); display.redraw(); }), Some(Opcode::DrawBootLogo) => msg_scalar_unpack!(msg, _, _, _, _, { display.blit_screen(&poweron::LOGO_MAP); - display.update(); display.redraw(); }), Some(Opcode::Devboot) => msg_scalar_unpack!(msg, ena, _, _, _, { @@ -543,7 +540,6 @@ fn wrapped_main() -> ! { testpat[lines * backend::FB_WIDTH_WORDS + (backend::FB_WIDTH_WORDS - 1)] |= 0x1_0000; } display.blit_screen(testpat); - display.update(); display.redraw(); ticktimer.sleep_ms(DWELL).unwrap(); @@ -553,7 +549,6 @@ fn wrapped_main() -> ! { } // dirty bits already set display.blit_screen(testpat); - display.update(); display.redraw(); ticktimer.sleep_ms(DWELL).unwrap(); @@ -564,7 +559,6 @@ fn wrapped_main() -> ! { } } display.blit_screen(testpat); - display.update(); display.redraw(); ticktimer.sleep_ms(DWELL).unwrap(); @@ -574,7 +568,6 @@ fn wrapped_main() -> ! { } } display.blit_screen(testpat); - display.update(); display.redraw(); ticktimer.sleep_ms(DWELL).unwrap(); @@ -590,7 +583,6 @@ fn wrapped_main() -> ! { testpat[lines * backend::FB_WIDTH_WORDS + (backend::FB_WIDTH_WORDS - 1)] |= 0x1_0000; } display.blit_screen(testpat); - display.update(); display.redraw(); ticktimer.sleep_ms(DWELL).unwrap(); @@ -605,7 +597,6 @@ fn wrapped_main() -> ! { testpat[lines * backend::FB_WIDTH_WORDS + (backend::FB_WIDTH_WORDS - 1)] |= 0x1_0000; } display.blit_screen(testpat); - display.update(); display.redraw(); ticktimer.sleep_ms(DWELL).unwrap();