From f55c42b94037fbd1658fbb4f28c577b298b409df Mon Sep 17 00:00:00 2001 From: cepetr Date: Thu, 25 Apr 2024 08:57:06 +0200 Subject: [PATCH] fixup! feat(core): refactor display drivers --- core/SConscript.bootloader_emu | 2 -- core/SConscript.firmware | 1 - core/SConscript.unix | 1 - core/embed/rust/Cargo.toml | 4 ++-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/SConscript.bootloader_emu b/core/SConscript.bootloader_emu index c57cecd0b..4c1653f17 100644 --- a/core/SConscript.bootloader_emu +++ b/core/SConscript.bootloader_emu @@ -318,14 +318,12 @@ def cargo_build(): features.append('new_rendering') if TREZOR_MODEL in ('T',): features.append('display_rgb565') - features.append('ui_antialiasing') elif TREZOR_MODEL in ('R', '1',): features.append('display_mono') features.append('xframebuffer') elif TREZOR_MODEL in ('T3T1',): features.append('display_rgb565') features.append('xframebuffer') - features.append('ui_antialiasing') if TREZOR_MODEL in ('T', 'T3T1'): features.append('touch') diff --git a/core/SConscript.firmware b/core/SConscript.firmware index aacafa3ab..9ba3e55aa 100644 --- a/core/SConscript.firmware +++ b/core/SConscript.firmware @@ -769,7 +769,6 @@ def cargo_build(): features.append('debug') features.append('ui_debug') if TREZOR_MODEL in ('T', 'T3T1', 'DISC1', 'DISC2'): - features.append('ui_antialiasing') features.append('ui_blurring') features.append('ui_jpeg_decoder') diff --git a/core/SConscript.unix b/core/SConscript.unix index bed716ab0..b358650ff 100644 --- a/core/SConscript.unix +++ b/core/SConscript.unix @@ -875,7 +875,6 @@ def cargo_build(): if TREZOR_MODEL in ('T', 'T3T1'): features.append('touch') features.append('sd_card') - features.append('ui_antialiasing') features.append('ui_blurring') features.append('ui_jpeg_decoder') if TREZOR_MODEL in ('R', '1'): diff --git a/core/embed/rust/Cargo.toml b/core/embed/rust/Cargo.toml index d66ab18c1..21a2f1038 100644 --- a/core/embed/rust/Cargo.toml +++ b/core/embed/rust/Cargo.toml @@ -17,8 +17,8 @@ ui = [] dma2d = [] xframebuffer = [] display_mono = [] -display_rgb565 = [] -display_rgba8888 = [] +display_rgb565 = ["ui_antialiasing"] +display_rgba8888 = ["ui_antialiasing"] framebuffer = [] framebuffer32bit = [] ui_debug = []