From 68d7a4c332637e54dcd81c68ff0f096e8dee531d Mon Sep 17 00:00:00 2001 From: cepetr Date: Fri, 5 Apr 2024 16:47:41 +0200 Subject: [PATCH] fix(core): fix build on macos (do not merge) [no changelog] --- core/embed/rust/src/ui/shape/display/fb_rgb565.rs | 4 ++-- core/embed/trezorhal/unix/display_driver.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/embed/rust/src/ui/shape/display/fb_rgb565.rs b/core/embed/rust/src/ui/shape/display/fb_rgb565.rs index 986a10d75..b7d0cf5c9 100644 --- a/core/embed/rust/src/ui/shape/display/fb_rgb565.rs +++ b/core/embed/rust/src/ui/shape/display/fb_rgb565.rs @@ -12,10 +12,10 @@ pub fn render_on_display<'a, F>(clip: Option, bg_color: Option, fun where F: FnOnce(&mut DirectRenderer<'_, 'a, Rgb565Canvas<'a>>), { - #[link_section = ".no_dma_buffers"] + //#[link_section = ".no_dma_buffers"] static mut BUMP_A: Bump<[u8; 40 * 1024]> = Bump::uninit(); - #[link_section = ".buf"] + //#[link_section = ".buf"] static mut BUMP_B: Bump<[u8; 16 * 1024]> = Bump::uninit(); let bump_a = unsafe { &mut *core::ptr::addr_of_mut!(BUMP_A) }; diff --git a/core/embed/trezorhal/unix/display_driver.c b/core/embed/trezorhal/unix/display_driver.c index 7f2946aea..cce03e97b 100644 --- a/core/embed/trezorhal/unix/display_driver.c +++ b/core/embed/trezorhal/unix/display_driver.c @@ -165,7 +165,7 @@ void display_init(void) { #ifdef __APPLE__ // macOS Mojave SDL black screen workaround SDL_PumpEvents(); - SDL_SetWindowSize(WINDOW, WINDOW_WIDTH, WINDOW_HEIGHT); + SDL_SetWindowSize(drv->window, WINDOW_WIDTH, WINDOW_HEIGHT); #endif #ifdef TREZOR_EMULATOR_RASPI #include "background_raspi.h"