From 5a9f7de20df283e2f1632e880f47ea6d363b74e4 Mon Sep 17 00:00:00 2001 From: lujiale Date: Mon, 20 Feb 2023 22:44:37 +0800 Subject: [PATCH] [awtk/lvgl]: update --- project/3rdparty/include/libdrm/drm/drm.h | 4 +- .../3rdparty/source/libdrm/amdgpu/amdgpu.ids | 973 +++++++++--------- .../3rdparty/source/libdrm/tools/util/kms.c | 1 + project/3rdparty/source/libdrm/xf86drm.c | 10 +- .../entry/gui_demo/lvgl/benchmark/benchmark.c | 9 + .../entry/gui_demo/lvgl/benchmark/benchmark.h | 2 + project/gui/awtk/src/widgets/pages.c | 5 +- .../window_manager/window_manager_default.c | 8 +- project/gui/lvgl/lvglx/lv_conf.h | 5 + .../lvgl/lvglx/lvgl/src/core/lv_obj_style.c | 3 +- .../lvgl/src/draw/nxp/pxp/lv_draw_pxp_blend.c | 3 +- .../lvglx/lvgl/src/draw/sdl/lv_draw_sdl_img.c | 3 +- .../lvglx/lvgl/src/draw/sw/lv_draw_sw_blend.c | 27 +- .../lvglx/lvgl/src/draw/sw/lv_draw_sw_img.c | 5 +- .../lvgl/src/draw/sw/lv_draw_sw_transform.c | 7 +- .../draw/swm341_dma2d/lv_gpu_swm341_dma2d.c | 2 +- .../lvgl/lvglx/lvgl/src/lv_conf_internal.h | 29 + .../gui/lvgl/lvglx/lvgl/src/misc/lv_color.c | 5 +- .../gui/lvgl/lvglx/lvgl/src/misc/lv_color.h | 4 +- .../src/themes/default/lv_theme_default.c | 5 +- .../lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.c | 64 +- .../lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.h | 12 +- .../lvgl/lvglx/lvgl/src/widgets/led/lv_led.c | 25 +- .../lvglx/lvgl/src/widgets/meter/lv_meter.c | 3 +- 24 files changed, 654 insertions(+), 560 deletions(-) diff --git a/project/3rdparty/include/libdrm/drm/drm.h b/project/3rdparty/include/libdrm/drm/drm.h index 27409e3d3..3bd1de194 100644 --- a/project/3rdparty/include/libdrm/drm/drm.h +++ b/project/3rdparty/include/libdrm/drm/drm.h @@ -32,9 +32,9 @@ extern "C" { #define LIBDRM_VERSION_MAJOR 2 #define LIBDRM_VERSION_MINOR 4 -#define LIBDRM_VERSION_PATCH 114 +#define LIBDRM_VERSION_PATCH 115 -#define LIBDRM_VERSION_STRING "2.4.114" +#define LIBDRM_VERSION_STRING "2.4.115" #define DRM_NAME "drm" diff --git a/project/3rdparty/source/libdrm/amdgpu/amdgpu.ids b/project/3rdparty/source/libdrm/amdgpu/amdgpu.ids index c7a48bc9c..53cf61cbb 100644 --- a/project/3rdparty/source/libdrm/amdgpu/amdgpu.ids +++ b/project/3rdparty/source/libdrm/amdgpu/amdgpu.ids @@ -1,487 +1,496 @@ # List of AMDGPU IDs # # Syntax: -# device_id, revision_id, product_name <-- single tab after comma +# device_id, revision_id, product_name <-- single tab after comma 1.0.0 -1309, 00, AMD Radeon R7 Graphics -130A, 00, AMD Radeon R6 Graphics -130B, 00, AMD Radeon R4 Graphics -130C, 00, AMD Radeon R7 Graphics -130D, 00, AMD Radeon R6 Graphics -130E, 00, AMD Radeon R5 Graphics -130F, 00, AMD Radeon R7 Graphics -130F, D4, AMD Radeon R7 Graphics -130F, D5, AMD Radeon R7 Graphics -130F, D6, AMD Radeon R7 Graphics -130F, D7, AMD Radeon R7 Graphics -1313, 00, AMD Radeon R7 Graphics -1313, D4, AMD Radeon R7 Graphics -1313, D5, AMD Radeon R7 Graphics -1313, D6, AMD Radeon R7 Graphics -1315, 00, AMD Radeon R5 Graphics -1315, D4, AMD Radeon R5 Graphics -1315, D5, AMD Radeon R5 Graphics -1315, D6, AMD Radeon R5 Graphics -1315, D7, AMD Radeon R5 Graphics -1316, 00, AMD Radeon R5 Graphics -1318, 00, AMD Radeon R5 Graphics -131B, 00, AMD Radeon R4 Graphics -131C, 00, AMD Radeon R7 Graphics -131D, 00, AMD Radeon R6 Graphics -15D8, 00, AMD Radeon RX Vega 8 Graphics WS -15D8, 91, AMD Radeon Vega 3 Graphics -15D8, 91, AMD Ryzen Embedded R1606G with Radeon Vega Gfx -15D8, 92, AMD Radeon Vega 3 Graphics -15D8, 92, AMD Ryzen Embedded R1505G with Radeon Vega Gfx -15D8, 93, AMD Radeon Vega 1 Graphics -15D8, A1, AMD Radeon Vega 10 Graphics -15D8, A2, AMD Radeon Vega 8 Graphics -15D8, A3, AMD Radeon Vega 6 Graphics -15D8, A4, AMD Radeon Vega 3 Graphics -15D8, B1, AMD Radeon Vega 10 Graphics -15D8, B2, AMD Radeon Vega 8 Graphics -15D8, B3, AMD Radeon Vega 6 Graphics -15D8, B4, AMD Radeon Vega 3 Graphics -15D8, C1, AMD Radeon Vega 10 Graphics -15D8, C2, AMD Radeon Vega 8 Graphics -15D8, C3, AMD Radeon Vega 6 Graphics -15D8, C4, AMD Radeon Vega 3 Graphics -15D8, C5, AMD Radeon Vega 3 Graphics -15D8, C8, AMD Radeon Vega 11 Graphics -15D8, C9, AMD Radeon Vega 8 Graphics -15D8, CA, AMD Radeon Vega 11 Graphics -15D8, CB, AMD Radeon Vega 8 Graphics -15D8, CC, AMD Radeon Vega 3 Graphics -15D8, CE, AMD Radeon Vega 3 Graphics -15D8, CF, AMD Ryzen Embedded R1305G with Radeon Vega Gfx -15D8, D1, AMD Radeon Vega 10 Graphics -15D8, D2, AMD Radeon Vega 8 Graphics -15D8, D3, AMD Radeon Vega 6 Graphics -15D8, D4, AMD Radeon Vega 3 Graphics -15D8, D8, AMD Radeon Vega 11 Graphics -15D8, D9, AMD Radeon Vega 8 Graphics -15D8, DA, AMD Radeon Vega 11 Graphics -15D8, DB, AMD Radeon Vega 3 Graphics -15D8, DB, AMD Radeon Vega 8 Graphics -15D8, DC, AMD Radeon Vega 3 Graphics -15D8, DD, AMD Radeon Vega 3 Graphics -15D8, DE, AMD Radeon Vega 3 Graphics -15D8, DF, AMD Radeon Vega 3 Graphics -15D8, E3, AMD Radeon Vega 3 Graphics -15D8, E4, AMD Ryzen Embedded R1102G with Radeon Vega Gfx -15DD, 81, AMD Ryzen Embedded V1807B with Radeon Vega Gfx -15DD, 82, AMD Ryzen Embedded V1756B with Radeon Vega Gfx -15DD, 83, AMD Ryzen Embedded V1605B with Radeon Vega Gfx -15DD, 84, AMD Radeon Vega 6 Graphics -15DD, 85, AMD Ryzen Embedded V1202B with Radeon Vega Gfx -15DD, 86, AMD Radeon Vega 11 Graphics -15DD, 88, AMD Radeon Vega 8 Graphics -15DD, C1, AMD Radeon Vega 11 Graphics -15DD, C2, AMD Radeon Vega 8 Graphics -15DD, C3, AMD Radeon Vega 3 / 10 Graphics -15DD, C4, AMD Radeon Vega 8 Graphics -15DD, C5, AMD Radeon Vega 3 Graphics -15DD, C6, AMD Radeon Vega 11 Graphics -15DD, C8, AMD Radeon Vega 8 Graphics -15DD, C9, AMD Radeon Vega 11 Graphics -15DD, CA, AMD Radeon Vega 8 Graphics -15DD, CB, AMD Radeon Vega 3 Graphics -15DD, CC, AMD Radeon Vega 6 Graphics -15DD, CE, AMD Radeon Vega 3 Graphics -15DD, CF, AMD Radeon Vega 3 Graphics -15DD, D0, AMD Radeon Vega 10 Graphics -15DD, D1, AMD Radeon Vega 8 Graphics -15DD, D3, AMD Radeon Vega 11 Graphics -15DD, D5, AMD Radeon Vega 8 Graphics -15DD, D6, AMD Radeon Vega 11 Graphics -15DD, D7, AMD Radeon Vega 8 Graphics -15DD, D8, AMD Radeon Vega 3 Graphics -15DD, D9, AMD Radeon Vega 6 Graphics -15DD, E1, AMD Radeon Vega 3 Graphics -15DD, E2, AMD Radeon Vega 3 Graphics -163F, AE, AMD Custom GPU 0405 -6600, 00, AMD Radeon HD 8600 / 8700M -6600, 81, AMD Radeon R7 M370 -6601, 00, AMD Radeon HD 8500M / 8700M -6604, 00, AMD Radeon R7 M265 Series -6604, 81, AMD Radeon R7 M350 -6605, 00, AMD Radeon R7 M260 Series -6605, 81, AMD Radeon R7 M340 -6606, 00, AMD Radeon HD 8790M -6607, 00, AMD Radeon R5 M240 -6608, 00, AMD FirePro W2100 -6610, 00, AMD Radeon R7 200 Series -6610, 81, AMD Radeon R7 350 -6610, 83, AMD Radeon R5 340 -6610, 87, AMD Radeon R7 200 Series -6611, 00, AMD Radeon R7 200 Series -6611, 87, AMD Radeon R7 200 Series -6613, 00, AMD Radeon R7 200 Series -6617, 00, AMD Radeon R7 240 Series -6617, 87, AMD Radeon R7 200 Series -6617, C7, AMD Radeon R7 240 Series -6640, 00, AMD Radeon HD 8950 -6640, 80, AMD Radeon R9 M380 -6646, 00, AMD Radeon R9 M280X -6646, 80, AMD Radeon R9 M385 -6646, 80, AMD Radeon R9 M470X -6647, 00, AMD Radeon R9 M200X Series -6647, 80, AMD Radeon R9 M380 -6649, 00, AMD FirePro W5100 -6658, 00, AMD Radeon R7 200 Series -665C, 00, AMD Radeon HD 7700 Series -665D, 00, AMD Radeon R7 200 Series -665F, 81, AMD Radeon R7 360 Series -6660, 00, AMD Radeon HD 8600M Series -6660, 81, AMD Radeon R5 M335 -6660, 83, AMD Radeon R5 M330 -6663, 00, AMD Radeon HD 8500M Series -6663, 83, AMD Radeon R5 M320 -6664, 00, AMD Radeon R5 M200 Series -6665, 00, AMD Radeon R5 M230 Series -6665, 83, AMD Radeon R5 M320 -6665, C3, AMD Radeon R5 M435 -6666, 00, AMD Radeon R5 M200 Series -6667, 00, AMD Radeon R5 M200 Series -666F, 00, AMD Radeon HD 8500M -66A1, 02, AMD Instinct MI60 / MI50 -66A1, 06, AMD Radeon Pro VII -66AF, C1, AMD Radeon VII -6780, 00, AMD FirePro W9000 -6784, 00, ATI FirePro V (FireGL V) Graphics Adapter -6788, 00, ATI FirePro V (FireGL V) Graphics Adapter -678A, 00, AMD FirePro W8000 -6798, 00, AMD Radeon R9 200 / HD 7900 Series -6799, 00, AMD Radeon HD 7900 Series -679A, 00, AMD Radeon HD 7900 Series -679B, 00, AMD Radeon HD 7900 Series -679E, 00, AMD Radeon HD 7800 Series -67A0, 00, AMD Radeon FirePro W9100 -67A1, 00, AMD Radeon FirePro W8100 -67B0, 00, AMD Radeon R9 200 Series -67B0, 80, AMD Radeon R9 390 Series -67B1, 00, AMD Radeon R9 200 Series -67B1, 80, AMD Radeon R9 390 Series -67B9, 00, AMD Radeon R9 200 Series -67C0, 00, AMD Radeon Pro WX 7100 Graphics -67C0, 80, AMD Radeon E9550 -67C2, 01, AMD Radeon Pro V7350x2 -67C2, 02, AMD Radeon Pro V7300X -67C4, 00, AMD Radeon Pro WX 7100 Graphics -67C4, 80, AMD Radeon E9560 / E9565 Graphics -67C7, 00, AMD Radeon Pro WX 5100 Graphics -67C7, 80, AMD Radeon E9390 Graphics -67D0, 01, AMD Radeon Pro V7350x2 -67D0, 02, AMD Radeon Pro V7300X -67DF, C0, AMD Radeon Pro 580X -67DF, C1, AMD Radeon RX 580 Series -67DF, C2, AMD Radeon RX 570 Series -67DF, C3, AMD Radeon RX 580 Series -67DF, C4, AMD Radeon RX 480 Graphics -67DF, C5, AMD Radeon RX 470 Graphics -67DF, C6, AMD Radeon RX 570 Series -67DF, C7, AMD Radeon RX 480 Graphics -67DF, CF, AMD Radeon RX 470 Graphics -67DF, D7, AMD Radeon RX 470 Graphics -67DF, E0, AMD Radeon RX 470 Series -67DF, E1, AMD Radeon RX 590 Series -67DF, E3, AMD Radeon RX Series -67DF, E7, AMD Radeon RX 580 Series -67DF, EB, AMD Radeon Pro 580X -67DF, EF, AMD Radeon RX 570 Series -67DF, F7, AMD Radeon RX P30PH -67DF, FF, AMD Radeon RX 470 Series -67E0, 00, AMD Radeon Pro WX Series -67E3, 00, AMD Radeon Pro WX 4100 -67E8, 00, AMD Radeon Pro WX Series -67E8, 01, AMD Radeon Pro WX Series -67E8, 80, AMD Radeon E9260 Graphics -67EB, 00, AMD Radeon Pro V5300X -67EF, C0, AMD Radeon RX Graphics -67EF, C1, AMD Radeon RX 460 Graphics -67EF, C2, AMD Radeon Pro Series -67EF, C3, AMD Radeon RX Series -67EF, C5, AMD Radeon RX 460 Graphics -67EF, C7, AMD Radeon RX Graphics -67EF, CF, AMD Radeon RX 460 Graphics -67EF, E0, AMD Radeon RX 560 Series -67EF, E1, AMD Radeon RX Series -67EF, E2, AMD Radeon RX 560X -67EF, E3, AMD Radeon RX Series -67EF, E5, AMD Radeon RX 560 Series -67EF, E7, AMD Radeon RX 560 Series -67EF, EF, AMD Radeon 550 Series -67EF, FF, AMD Radeon RX 460 Graphics -67FF, C0, AMD Radeon Pro 465 -67FF, C1, AMD Radeon RX 560 Series -67FF, CF, AMD Radeon RX 560 Series -67FF, EF, AMD Radeon RX 560 Series -67FF, FF, AMD Radeon RX 550 Series -6800, 00, AMD Radeon HD 7970M -6801, 00, AMD Radeon HD 8970M -6806, 00, AMD Radeon R9 M290X -6808, 00, AMD FirePro W7000 -6808, 00, ATI FirePro V (FireGL V) Graphics Adapter -6809, 00, ATI FirePro W5000 -6810, 00, AMD Radeon R9 200 Series -6810, 81, AMD Radeon R9 370 Series -6811, 00, AMD Radeon R9 200 Series -6811, 81, AMD Radeon R7 370 Series -6818, 00, AMD Radeon HD 7800 Series -6819, 00, AMD Radeon HD 7800 Series -6820, 00, AMD Radeon R9 M275X -6820, 81, AMD Radeon R9 M375 -6820, 83, AMD Radeon R9 M375X -6821, 00, AMD Radeon R9 M200X Series -6821, 83, AMD Radeon R9 M370X -6821, 87, AMD Radeon R7 M380 -6822, 00, AMD Radeon E8860 -6823, 00, AMD Radeon R9 M200X Series -6825, 00, AMD Radeon HD 7800M Series -6826, 00, AMD Radeon HD 7700M Series -6827, 00, AMD Radeon HD 7800M Series -6828, 00, AMD FirePro W600 -682B, 00, AMD Radeon HD 8800M Series -682B, 87, AMD Radeon R9 M360 -682C, 00, AMD FirePro W4100 -682D, 00, AMD Radeon HD 7700M Series -682F, 00, AMD Radeon HD 7700M Series -6830, 00, AMD Radeon 7800M Series -6831, 00, AMD Radeon 7700M Series -6835, 00, AMD Radeon R7 Series / HD 9000 Series -6837, 00, AMD Radeon HD 7700 Series -683D, 00, AMD Radeon HD 7700 Series -683F, 00, AMD Radeon HD 7700 Series -684C, 00, ATI FirePro V (FireGL V) Graphics Adapter -6860, 00, AMD Radeon Instinct MI25 -6860, 01, AMD Radeon Instinct MI25 -6860, 02, AMD Radeon Instinct MI25 -6860, 03, AMD Radeon Pro V340 -6860, 04, AMD Radeon Instinct MI25x2 -6860, 07, AMD Radeon Pro V320 -6861, 00, AMD Radeon Pro WX 9100 -6862, 00, AMD Radeon Pro SSG -6863, 00, AMD Radeon Vega Frontier Edition -6864, 03, AMD Radeon Pro V340 -6864, 04, AMD Radeon Instinct MI25x2 -6864, 05, AMD Radeon Pro V340 -6868, 00, AMD Radeon Pro WX 8200 -686C, 00, AMD Radeon Instinct MI25 MxGPU -686C, 01, AMD Radeon Instinct MI25 MxGPU -686C, 02, AMD Radeon Instinct MI25 MxGPU -686C, 03, AMD Radeon Pro V340 MxGPU -686C, 04, AMD Radeon Instinct MI25x2 MxGPU -686C, 05, AMD Radeon Pro V340L MxGPU -686C, 06, AMD Radeon Instinct MI25 MxGPU -687F, 01, AMD Radeon RX Vega -687F, C0, AMD Radeon RX Vega -687F, C1, AMD Radeon RX Vega -687F, C3, AMD Radeon RX Vega -687F, C7, AMD Radeon RX Vega -6900, 00, AMD Radeon R7 M260 -6900, 81, AMD Radeon R7 M360 -6900, 83, AMD Radeon R7 M340 -6900, C1, AMD Radeon R5 M465 Series -6900, C3, AMD Radeon R5 M445 Series -6900, D1, AMD Radeon 530 Series -6900, D3, AMD Radeon 530 Series -6901, 00, AMD Radeon R5 M255 -6902, 00, AMD Radeon Series -6907, 00, AMD Radeon R5 M255 -6907, 87, AMD Radeon R5 M315 -6920, 00, AMD Radeon R9 M395X -6920, 01, AMD Radeon R9 M390X -6921, 00, AMD Radeon R9 M390X -6929, 00, AMD FirePro S7150 -6929, 01, AMD FirePro S7100X -692B, 00, AMD FirePro W7100 -6938, 00, AMD Radeon R9 200 Series -6938, F0, AMD Radeon R9 200 Series -6938, F1, AMD Radeon R9 380 Series -6939, 00, AMD Radeon R9 200 Series -6939, F0, AMD Radeon R9 200 Series -6939, F1, AMD Radeon R9 380 Series -694C, C0, AMD Radeon RX Vega M GH Graphics -694E, C0, AMD Radeon RX Vega M GL Graphics -6980, 00, AMD Radeon Pro WX 3100 -6981, 00, AMD Radeon Pro WX 3200 Series -6981, 01, AMD Radeon Pro WX 3200 Series -6981, 10, AMD Radeon Pro WX 3200 Series -6985, 00, AMD Radeon Pro WX 3100 -6986, 00, AMD Radeon Pro WX 2100 -6987, 80, AMD Embedded Radeon E9171 -6987, C0, AMD Radeon 550X Series -6987, C1, AMD Radeon RX 640 -6987, C3, AMD Radeon 540X Series -6987, C7, AMD Radeon 540 -6995, 00, AMD Radeon Pro WX 2100 -6997, 00, AMD Radeon Pro WX 2100 -699F, 81, AMD Embedded Radeon E9170 Series -699F, C0, AMD Radeon 500 Series -699F, C1, AMD Radeon 540 Series -699F, C3, AMD Radeon 500 Series -699F, C7, AMD Radeon RX 550 / 550 Series -699F, C9, AMD Radeon 540 -6FDF, E7, AMD Radeon RX 590 GME -6FDF, EF, AMD Radeon RX 580 2048SP -7300, C1, AMD FirePro S9300 x2 -7300, C8, AMD Radeon R9 Fury Series -7300, C9, AMD Radeon Pro Duo -7300, CA, AMD Radeon R9 Fury Series -7300, CB, AMD Radeon R9 Fury Series -7312, 00, AMD Radeon Pro W5700 -731E, C6, AMD Radeon RX 5700XTB -731E, C7, AMD Radeon RX 5700B -731F, C0, AMD Radeon RX 5700 XT 50th Anniversary -731F, C1, AMD Radeon RX 5700 XT -731F, C2, AMD Radeon RX 5600M -731F, C3, AMD Radeon RX 5700M -731F, C4, AMD Radeon RX 5700 -731F, C5, AMD Radeon RX 5700 XT -731F, CA, AMD Radeon RX 5600 XT -731F, CB, AMD Radeon RX 5600 OEM -7340, C1, AMD Radeon RX 5500M -7340, C3, AMD Radeon RX 5300M -7340, C5, AMD Radeon RX 5500 XT -7340, C7, AMD Radeon RX 5500 -7340, C9, AMD Radeon RX 5500XTB -7340, CF, AMD Radeon RX 5300 -7341, 00, AMD Radeon Pro W5500 -7347, 00, AMD Radeon Pro W5500M -7360, 41, AMD Radeon Pro 5600M -7360, C3, AMD Radeon Pro V520 -738C, 01, AMD Instinct MI100 -73A3, 00, AMD Radeon Pro W6800 -73A5, C0, AMD Radeon RX 6950 XT -73AF, C0, AMD Radeon RX 6900 XT -73BF, C0, AMD Radeon RX 6900 XT -73BF, C1, AMD Radeon RX 6800 XT -73BF, C3, AMD Radeon RX 6800 -73DF, C0, AMD Radeon RX 6750 XT -73DF, C1, AMD Radeon RX 6700 XT -73DF, C2, AMD Radeon RX 6800M -73DF, C3, AMD Radeon RX 6800M -73DF, C5, AMD Radeon RX 6700 XT -73DF, CF, AMD Radeon RX 6700M -73DF, D7, AMD TDC-235 -73E1, 00, AMD Radeon Pro W6600M -73E3, 00, AMD Radeon Pro W6600 -73EF, C0, AMD Radeon RX 6800S -73EF, C1, AMD Radeon RX 6650 XT -73EF, C2, AMD Radeon RX 6700S -73EF, C3, AMD Radeon RX 6650M -73EF, C4, AMD Radeon RX 6650M XT -73FF, C1, AMD Radeon RX 6600 XT -73FF, C3, AMD Radeon RX 6600M -73FF, C7, AMD Radeon RX 6600 -73FF, CB, AMD Radeon RX 6600S -7408, 00, AMD Instinct MI250X -740C, 01, AMD Instinct MI250X / MI250 -740F, 02, AMD Instinct MI210 -7421, 00, AMD Radeon Pro W6500M -7422, 00, AMD Radeon Pro W6400 -7423, 00, AMD Radeon Pro W6300M -7423, 01, AMD Radeon Pro W6300 -7424, 00, AMD Radeon RX 6300 -743F, C1, AMD Radeon RX 6500 XT -743F, C3, AMD Radeon RX 6500 -743F, C3, AMD Radeon RX 6500M -743F, C7, AMD Radeon RX 6400 -743F, CF, AMD Radeon RX 6300M -9830, 00, AMD Radeon HD 8400 / R3 Series -9831, 00, AMD Radeon HD 8400E -9832, 00, AMD Radeon HD 8330 -9833, 00, AMD Radeon HD 8330E -9834, 00, AMD Radeon HD 8210 -9835, 00, AMD Radeon HD 8210E -9836, 00, AMD Radeon HD 8200 / R3 Series -9837, 00, AMD Radeon HD 8280E -9838, 00, AMD Radeon HD 8200 / R3 series -9839, 00, AMD Radeon HD 8180 -983D, 00, AMD Radeon HD 8250 -9850, 00, AMD Radeon R3 Graphics -9850, 03, AMD Radeon R3 Graphics -9850, 40, AMD Radeon R2 Graphics -9850, 45, AMD Radeon R3 Graphics -9851, 00, AMD Radeon R4 Graphics -9851, 01, AMD Radeon R5E Graphics -9851, 05, AMD Radeon R5 Graphics -9851, 06, AMD Radeon R5E Graphics -9851, 40, AMD Radeon R4 Graphics -9851, 45, AMD Radeon R5 Graphics -9852, 00, AMD Radeon R2 Graphics -9852, 40, AMD Radeon E1 Graphics -9853, 00, AMD Radeon R2 Graphics -9853, 01, AMD Radeon R4E Graphics -9853, 03, AMD Radeon R2 Graphics -9853, 05, AMD Radeon R1E Graphics -9853, 06, AMD Radeon R1E Graphics -9853, 07, AMD Radeon R1E Graphics -9853, 08, AMD Radeon R1E Graphics -9853, 40, AMD Radeon R2 Graphics -9854, 00, AMD Radeon R3 Graphics -9854, 01, AMD Radeon R3E Graphics -9854, 02, AMD Radeon R3 Graphics -9854, 05, AMD Radeon R2 Graphics -9854, 06, AMD Radeon R4 Graphics -9854, 07, AMD Radeon R3 Graphics -9855, 02, AMD Radeon R6 Graphics -9855, 05, AMD Radeon R4 Graphics -9856, 00, AMD Radeon R2 Graphics -9856, 01, AMD Radeon R2E Graphics -9856, 02, AMD Radeon R2 Graphics -9856, 05, AMD Radeon R1E Graphics -9856, 06, AMD Radeon R2 Graphics -9856, 07, AMD Radeon R1E Graphics -9856, 08, AMD Radeon R1E Graphics -9856, 13, AMD Radeon R1E Graphics -9874, 81, AMD Radeon R6 Graphics -9874, 84, AMD Radeon R7 Graphics -9874, 85, AMD Radeon R6 Graphics -9874, 87, AMD Radeon R5 Graphics -9874, 88, AMD Radeon R7E Graphics -9874, 89, AMD Radeon R6E Graphics -9874, C4, AMD Radeon R7 Graphics -9874, C5, AMD Radeon R6 Graphics -9874, C6, AMD Radeon R6 Graphics -9874, C7, AMD Radeon R5 Graphics -9874, C8, AMD Radeon R7 Graphics -9874, C9, AMD Radeon R7 Graphics -9874, CA, AMD Radeon R5 Graphics -9874, CB, AMD Radeon R5 Graphics -9874, CC, AMD Radeon R7 Graphics -9874, CD, AMD Radeon R7 Graphics -9874, CE, AMD Radeon R5 Graphics -9874, E1, AMD Radeon R7 Graphics -9874, E2, AMD Radeon R7 Graphics -9874, E3, AMD Radeon R7 Graphics -9874, E4, AMD Radeon R7 Graphics -9874, E5, AMD Radeon R5 Graphics -9874, E6, AMD Radeon R5 Graphics -98E4, 80, AMD Radeon R5E Graphics -98E4, 81, AMD Radeon R4E Graphics -98E4, 83, AMD Radeon R2E Graphics -98E4, 84, AMD Radeon R2E Graphics -98E4, 86, AMD Radeon R1E Graphics -98E4, C0, AMD Radeon R4 Graphics -98E4, C1, AMD Radeon R5 Graphics -98E4, C2, AMD Radeon R4 Graphics -98E4, C4, AMD Radeon R5 Graphics -98E4, C6, AMD Radeon R5 Graphics -98E4, C8, AMD Radeon R4 Graphics -98E4, C9, AMD Radeon R4 Graphics -98E4, CA, AMD Radeon R5 Graphics -98E4, D0, AMD Radeon R2 Graphics -98E4, D1, AMD Radeon R2 Graphics -98E4, D2, AMD Radeon R2 Graphics -98E4, D4, AMD Radeon R2 Graphics -98E4, D9, AMD Radeon R5 Graphics -98E4, DA, AMD Radeon R5 Graphics -98E4, DB, AMD Radeon R3 Graphics -98E4, E1, AMD Radeon R3 Graphics -98E4, E2, AMD Radeon R3 Graphics -98E4, E9, AMD Radeon R4 Graphics -98E4, EA, AMD Radeon R4 Graphics -98E4, EB, AMD Radeon R3 Graphics -98E4, EB, AMD Radeon R4 Graphics \ No newline at end of file +1309, 00, AMD Radeon R7 Graphics +130A, 00, AMD Radeon R6 Graphics +130B, 00, AMD Radeon R4 Graphics +130C, 00, AMD Radeon R7 Graphics +130D, 00, AMD Radeon R6 Graphics +130E, 00, AMD Radeon R5 Graphics +130F, 00, AMD Radeon R7 Graphics +130F, D4, AMD Radeon R7 Graphics +130F, D5, AMD Radeon R7 Graphics +130F, D6, AMD Radeon R7 Graphics +130F, D7, AMD Radeon R7 Graphics +1313, 00, AMD Radeon R7 Graphics +1313, D4, AMD Radeon R7 Graphics +1313, D5, AMD Radeon R7 Graphics +1313, D6, AMD Radeon R7 Graphics +1315, 00, AMD Radeon R5 Graphics +1315, D4, AMD Radeon R5 Graphics +1315, D5, AMD Radeon R5 Graphics +1315, D6, AMD Radeon R5 Graphics +1315, D7, AMD Radeon R5 Graphics +1316, 00, AMD Radeon R5 Graphics +1318, 00, AMD Radeon R5 Graphics +131B, 00, AMD Radeon R4 Graphics +131C, 00, AMD Radeon R7 Graphics +131D, 00, AMD Radeon R6 Graphics +15D8, 00, AMD Radeon RX Vega 8 Graphics WS +15D8, 91, AMD Radeon Vega 3 Graphics +15D8, 91, AMD Ryzen Embedded R1606G with Radeon Vega Gfx +15D8, 92, AMD Radeon Vega 3 Graphics +15D8, 92, AMD Ryzen Embedded R1505G with Radeon Vega Gfx +15D8, 93, AMD Radeon Vega 1 Graphics +15D8, A1, AMD Radeon Vega 10 Graphics +15D8, A2, AMD Radeon Vega 8 Graphics +15D8, A3, AMD Radeon Vega 6 Graphics +15D8, A4, AMD Radeon Vega 3 Graphics +15D8, B1, AMD Radeon Vega 10 Graphics +15D8, B2, AMD Radeon Vega 8 Graphics +15D8, B3, AMD Radeon Vega 6 Graphics +15D8, B4, AMD Radeon Vega 3 Graphics +15D8, C1, AMD Radeon Vega 10 Graphics +15D8, C2, AMD Radeon Vega 8 Graphics +15D8, C3, AMD Radeon Vega 6 Graphics +15D8, C4, AMD Radeon Vega 3 Graphics +15D8, C5, AMD Radeon Vega 3 Graphics +15D8, C8, AMD Radeon Vega 11 Graphics +15D8, C9, AMD Radeon Vega 8 Graphics +15D8, CA, AMD Radeon Vega 11 Graphics +15D8, CB, AMD Radeon Vega 8 Graphics +15D8, CC, AMD Radeon Vega 3 Graphics +15D8, CE, AMD Radeon Vega 3 Graphics +15D8, CF, AMD Ryzen Embedded R1305G with Radeon Vega Gfx +15D8, D1, AMD Radeon Vega 10 Graphics +15D8, D2, AMD Radeon Vega 8 Graphics +15D8, D3, AMD Radeon Vega 6 Graphics +15D8, D4, AMD Radeon Vega 3 Graphics +15D8, D8, AMD Radeon Vega 11 Graphics +15D8, D9, AMD Radeon Vega 8 Graphics +15D8, DA, AMD Radeon Vega 11 Graphics +15D8, DB, AMD Radeon Vega 3 Graphics +15D8, DB, AMD Radeon Vega 8 Graphics +15D8, DC, AMD Radeon Vega 3 Graphics +15D8, DD, AMD Radeon Vega 3 Graphics +15D8, DE, AMD Radeon Vega 3 Graphics +15D8, DF, AMD Radeon Vega 3 Graphics +15D8, E3, AMD Radeon Vega 3 Graphics +15D8, E4, AMD Ryzen Embedded R1102G with Radeon Vega Gfx +15DD, 81, AMD Ryzen Embedded V1807B with Radeon Vega Gfx +15DD, 82, AMD Ryzen Embedded V1756B with Radeon Vega Gfx +15DD, 83, AMD Ryzen Embedded V1605B with Radeon Vega Gfx +15DD, 84, AMD Radeon Vega 6 Graphics +15DD, 85, AMD Ryzen Embedded V1202B with Radeon Vega Gfx +15DD, 86, AMD Radeon Vega 11 Graphics +15DD, 88, AMD Radeon Vega 8 Graphics +15DD, C1, AMD Radeon Vega 11 Graphics +15DD, C2, AMD Radeon Vega 8 Graphics +15DD, C3, AMD Radeon Vega 3 / 10 Graphics +15DD, C4, AMD Radeon Vega 8 Graphics +15DD, C5, AMD Radeon Vega 3 Graphics +15DD, C6, AMD Radeon Vega 11 Graphics +15DD, C8, AMD Radeon Vega 8 Graphics +15DD, C9, AMD Radeon Vega 11 Graphics +15DD, CA, AMD Radeon Vega 8 Graphics +15DD, CB, AMD Radeon Vega 3 Graphics +15DD, CC, AMD Radeon Vega 6 Graphics +15DD, CE, AMD Radeon Vega 3 Graphics +15DD, CF, AMD Radeon Vega 3 Graphics +15DD, D0, AMD Radeon Vega 10 Graphics +15DD, D1, AMD Radeon Vega 8 Graphics +15DD, D3, AMD Radeon Vega 11 Graphics +15DD, D5, AMD Radeon Vega 8 Graphics +15DD, D6, AMD Radeon Vega 11 Graphics +15DD, D7, AMD Radeon Vega 8 Graphics +15DD, D8, AMD Radeon Vega 3 Graphics +15DD, D9, AMD Radeon Vega 6 Graphics +15DD, E1, AMD Radeon Vega 3 Graphics +15DD, E2, AMD Radeon Vega 3 Graphics +163F, AE, AMD Custom GPU 0405 +6600, 00, AMD Radeon HD 8600 / 8700M +6600, 81, AMD Radeon R7 M370 +6601, 00, AMD Radeon HD 8500M / 8700M +6604, 00, AMD Radeon R7 M265 Series +6604, 81, AMD Radeon R7 M350 +6605, 00, AMD Radeon R7 M260 Series +6605, 81, AMD Radeon R7 M340 +6606, 00, AMD Radeon HD 8790M +6607, 00, AMD Radeon R5 M240 +6608, 00, AMD FirePro W2100 +6610, 00, AMD Radeon R7 200 Series +6610, 81, AMD Radeon R7 350 +6610, 83, AMD Radeon R5 340 +6610, 87, AMD Radeon R7 200 Series +6611, 00, AMD Radeon R7 200 Series +6611, 87, AMD Radeon R7 200 Series +6613, 00, AMD Radeon R7 200 Series +6617, 00, AMD Radeon R7 240 Series +6617, 87, AMD Radeon R7 200 Series +6617, C7, AMD Radeon R7 240 Series +6640, 00, AMD Radeon HD 8950 +6640, 80, AMD Radeon R9 M380 +6646, 00, AMD Radeon R9 M280X +6646, 80, AMD Radeon R9 M385 +6646, 80, AMD Radeon R9 M470X +6647, 00, AMD Radeon R9 M200X Series +6647, 80, AMD Radeon R9 M380 +6649, 00, AMD FirePro W5100 +6658, 00, AMD Radeon R7 200 Series +665C, 00, AMD Radeon HD 7700 Series +665D, 00, AMD Radeon R7 200 Series +665F, 81, AMD Radeon R7 360 Series +6660, 00, AMD Radeon HD 8600M Series +6660, 81, AMD Radeon R5 M335 +6660, 83, AMD Radeon R5 M330 +6663, 00, AMD Radeon HD 8500M Series +6663, 83, AMD Radeon R5 M320 +6664, 00, AMD Radeon R5 M200 Series +6665, 00, AMD Radeon R5 M230 Series +6665, 83, AMD Radeon R5 M320 +6665, C3, AMD Radeon R5 M435 +6666, 00, AMD Radeon R5 M200 Series +6667, 00, AMD Radeon R5 M200 Series +666F, 00, AMD Radeon HD 8500M +66A1, 02, AMD Instinct MI60 / MI50 +66A1, 06, AMD Radeon Pro VII +66AF, C1, AMD Radeon VII +6780, 00, AMD FirePro W9000 +6784, 00, ATI FirePro V (FireGL V) Graphics Adapter +6788, 00, ATI FirePro V (FireGL V) Graphics Adapter +678A, 00, AMD FirePro W8000 +6798, 00, AMD Radeon R9 200 / HD 7900 Series +6799, 00, AMD Radeon HD 7900 Series +679A, 00, AMD Radeon HD 7900 Series +679B, 00, AMD Radeon HD 7900 Series +679E, 00, AMD Radeon HD 7800 Series +67A0, 00, AMD Radeon FirePro W9100 +67A1, 00, AMD Radeon FirePro W8100 +67B0, 00, AMD Radeon R9 200 Series +67B0, 80, AMD Radeon R9 390 Series +67B1, 00, AMD Radeon R9 200 Series +67B1, 80, AMD Radeon R9 390 Series +67B9, 00, AMD Radeon R9 200 Series +67C0, 00, AMD Radeon Pro WX 7100 Graphics +67C0, 80, AMD Radeon E9550 +67C2, 01, AMD Radeon Pro V7350x2 +67C2, 02, AMD Radeon Pro V7300X +67C4, 00, AMD Radeon Pro WX 7100 Graphics +67C4, 80, AMD Radeon E9560 / E9565 Graphics +67C7, 00, AMD Radeon Pro WX 5100 Graphics +67C7, 80, AMD Radeon E9390 Graphics +67D0, 01, AMD Radeon Pro V7350x2 +67D0, 02, AMD Radeon Pro V7300X +67DF, C0, AMD Radeon Pro 580X +67DF, C1, AMD Radeon RX 580 Series +67DF, C2, AMD Radeon RX 570 Series +67DF, C3, AMD Radeon RX 580 Series +67DF, C4, AMD Radeon RX 480 Graphics +67DF, C5, AMD Radeon RX 470 Graphics +67DF, C6, AMD Radeon RX 570 Series +67DF, C7, AMD Radeon RX 480 Graphics +67DF, CF, AMD Radeon RX 470 Graphics +67DF, D7, AMD Radeon RX 470 Graphics +67DF, E0, AMD Radeon RX 470 Series +67DF, E1, AMD Radeon RX 590 Series +67DF, E3, AMD Radeon RX Series +67DF, E7, AMD Radeon RX 580 Series +67DF, EB, AMD Radeon Pro 580X +67DF, EF, AMD Radeon RX 570 Series +67DF, F7, AMD Radeon RX P30PH +67DF, FF, AMD Radeon RX 470 Series +67E0, 00, AMD Radeon Pro WX Series +67E3, 00, AMD Radeon Pro WX 4100 +67E8, 00, AMD Radeon Pro WX Series +67E8, 01, AMD Radeon Pro WX Series +67E8, 80, AMD Radeon E9260 Graphics +67EB, 00, AMD Radeon Pro V5300X +67EF, C0, AMD Radeon RX Graphics +67EF, C1, AMD Radeon RX 460 Graphics +67EF, C2, AMD Radeon Pro Series +67EF, C3, AMD Radeon RX Series +67EF, C5, AMD Radeon RX 460 Graphics +67EF, C7, AMD Radeon RX Graphics +67EF, CF, AMD Radeon RX 460 Graphics +67EF, E0, AMD Radeon RX 560 Series +67EF, E1, AMD Radeon RX Series +67EF, E2, AMD Radeon RX 560X +67EF, E3, AMD Radeon RX Series +67EF, E5, AMD Radeon RX 560 Series +67EF, E7, AMD Radeon RX 560 Series +67EF, EF, AMD Radeon 550 Series +67EF, FF, AMD Radeon RX 460 Graphics +67FF, C0, AMD Radeon Pro 465 +67FF, C1, AMD Radeon RX 560 Series +67FF, CF, AMD Radeon RX 560 Series +67FF, EF, AMD Radeon RX 560 Series +67FF, FF, AMD Radeon RX 550 Series +6800, 00, AMD Radeon HD 7970M +6801, 00, AMD Radeon HD 8970M +6806, 00, AMD Radeon R9 M290X +6808, 00, AMD FirePro W7000 +6808, 00, ATI FirePro V (FireGL V) Graphics Adapter +6809, 00, ATI FirePro W5000 +6810, 00, AMD Radeon R9 200 Series +6810, 81, AMD Radeon R9 370 Series +6811, 00, AMD Radeon R9 200 Series +6811, 81, AMD Radeon R7 370 Series +6818, 00, AMD Radeon HD 7800 Series +6819, 00, AMD Radeon HD 7800 Series +6820, 00, AMD Radeon R9 M275X +6820, 81, AMD Radeon R9 M375 +6820, 83, AMD Radeon R9 M375X +6821, 00, AMD Radeon R9 M200X Series +6821, 83, AMD Radeon R9 M370X +6821, 87, AMD Radeon R7 M380 +6822, 00, AMD Radeon E8860 +6823, 00, AMD Radeon R9 M200X Series +6825, 00, AMD Radeon HD 7800M Series +6826, 00, AMD Radeon HD 7700M Series +6827, 00, AMD Radeon HD 7800M Series +6828, 00, AMD FirePro W600 +682B, 00, AMD Radeon HD 8800M Series +682B, 87, AMD Radeon R9 M360 +682C, 00, AMD FirePro W4100 +682D, 00, AMD Radeon HD 7700M Series +682F, 00, AMD Radeon HD 7700M Series +6830, 00, AMD Radeon 7800M Series +6831, 00, AMD Radeon 7700M Series +6835, 00, AMD Radeon R7 Series / HD 9000 Series +6837, 00, AMD Radeon HD 7700 Series +683D, 00, AMD Radeon HD 7700 Series +683F, 00, AMD Radeon HD 7700 Series +684C, 00, ATI FirePro V (FireGL V) Graphics Adapter +6860, 00, AMD Radeon Instinct MI25 +6860, 01, AMD Radeon Instinct MI25 +6860, 02, AMD Radeon Instinct MI25 +6860, 03, AMD Radeon Pro V340 +6860, 04, AMD Radeon Instinct MI25x2 +6860, 07, AMD Radeon Pro V320 +6861, 00, AMD Radeon Pro WX 9100 +6862, 00, AMD Radeon Pro SSG +6863, 00, AMD Radeon Vega Frontier Edition +6864, 03, AMD Radeon Pro V340 +6864, 04, AMD Radeon Instinct MI25x2 +6864, 05, AMD Radeon Pro V340 +6868, 00, AMD Radeon Pro WX 8200 +686C, 00, AMD Radeon Instinct MI25 MxGPU +686C, 01, AMD Radeon Instinct MI25 MxGPU +686C, 02, AMD Radeon Instinct MI25 MxGPU +686C, 03, AMD Radeon Pro V340 MxGPU +686C, 04, AMD Radeon Instinct MI25x2 MxGPU +686C, 05, AMD Radeon Pro V340L MxGPU +686C, 06, AMD Radeon Instinct MI25 MxGPU +687F, 01, AMD Radeon RX Vega +687F, C0, AMD Radeon RX Vega +687F, C1, AMD Radeon RX Vega +687F, C3, AMD Radeon RX Vega +687F, C7, AMD Radeon RX Vega +6900, 00, AMD Radeon R7 M260 +6900, 81, AMD Radeon R7 M360 +6900, 83, AMD Radeon R7 M340 +6900, C1, AMD Radeon R5 M465 Series +6900, C3, AMD Radeon R5 M445 Series +6900, D1, AMD Radeon 530 Series +6900, D3, AMD Radeon 530 Series +6901, 00, AMD Radeon R5 M255 +6902, 00, AMD Radeon Series +6907, 00, AMD Radeon R5 M255 +6907, 87, AMD Radeon R5 M315 +6920, 00, AMD Radeon R9 M395X +6920, 01, AMD Radeon R9 M390X +6921, 00, AMD Radeon R9 M390X +6929, 00, AMD FirePro S7150 +6929, 01, AMD FirePro S7100X +692B, 00, AMD FirePro W7100 +6938, 00, AMD Radeon R9 200 Series +6938, F0, AMD Radeon R9 200 Series +6938, F1, AMD Radeon R9 380 Series +6939, 00, AMD Radeon R9 200 Series +6939, F0, AMD Radeon R9 200 Series +6939, F1, AMD Radeon R9 380 Series +694C, C0, AMD Radeon RX Vega M GH Graphics +694E, C0, AMD Radeon RX Vega M GL Graphics +6980, 00, AMD Radeon Pro WX 3100 +6981, 00, AMD Radeon Pro WX 3200 Series +6981, 01, AMD Radeon Pro WX 3200 Series +6981, 10, AMD Radeon Pro WX 3200 Series +6985, 00, AMD Radeon Pro WX 3100 +6986, 00, AMD Radeon Pro WX 2100 +6987, 80, AMD Embedded Radeon E9171 +6987, C0, AMD Radeon 550X Series +6987, C1, AMD Radeon RX 640 +6987, C3, AMD Radeon 540X Series +6987, C7, AMD Radeon 540 +6995, 00, AMD Radeon Pro WX 2100 +6997, 00, AMD Radeon Pro WX 2100 +699F, 81, AMD Embedded Radeon E9170 Series +699F, C0, AMD Radeon 500 Series +699F, C1, AMD Radeon 540 Series +699F, C3, AMD Radeon 500 Series +699F, C7, AMD Radeon RX 550 / 550 Series +699F, C9, AMD Radeon 540 +6FDF, E7, AMD Radeon RX 590 GME +6FDF, EF, AMD Radeon RX 580 2048SP +7300, C1, AMD FirePro S9300 x2 +7300, C8, AMD Radeon R9 Fury Series +7300, C9, AMD Radeon Pro Duo +7300, CA, AMD Radeon R9 Fury Series +7300, CB, AMD Radeon R9 Fury Series +7312, 00, AMD Radeon Pro W5700 +731E, C6, AMD Radeon RX 5700XTB +731E, C7, AMD Radeon RX 5700B +731F, C0, AMD Radeon RX 5700 XT 50th Anniversary +731F, C1, AMD Radeon RX 5700 XT +731F, C2, AMD Radeon RX 5600M +731F, C3, AMD Radeon RX 5700M +731F, C4, AMD Radeon RX 5700 +731F, C5, AMD Radeon RX 5700 XT +731F, CA, AMD Radeon RX 5600 XT +731F, CB, AMD Radeon RX 5600 OEM +7340, C1, AMD Radeon RX 5500M +7340, C3, AMD Radeon RX 5300M +7340, C5, AMD Radeon RX 5500 XT +7340, C7, AMD Radeon RX 5500 +7340, C9, AMD Radeon RX 5500XTB +7340, CF, AMD Radeon RX 5300 +7341, 00, AMD Radeon Pro W5500 +7347, 00, AMD Radeon Pro W5500M +7360, 41, AMD Radeon Pro 5600M +7360, C3, AMD Radeon Pro V520 +7362, C1, AMD Radeon Pro V540 +7362, C3, AMD Radeon Pro V520 +738C, 01, AMD Instinct MI100 +73A1, 00, AMD Radeon Pro V620 +73A3, 00, AMD Radeon Pro W6800 +73A5, C0, AMD Radeon RX 6950 XT +73AE, 00, AMD Radeon Pro V620 +73AF, C0, AMD Radeon RX 6900 XT +73BF, C0, AMD Radeon RX 6900 XT +73BF, C1, AMD Radeon RX 6800 XT +73BF, C3, AMD Radeon RX 6800 +73DF, C0, AMD Radeon RX 6750 XT +73DF, C1, AMD Radeon RX 6700 XT +73DF, C2, AMD Radeon RX 6800M +73DF, C3, AMD Radeon RX 6800M +73DF, C5, AMD Radeon RX 6700 XT +73DF, CF, AMD Radeon RX 6700M +73DF, D7, AMD TDC-235 +73E1, 00, AMD Radeon Pro W6600M +73E3, 00, AMD Radeon Pro W6600 +73EF, C0, AMD Radeon RX 6800S +73EF, C1, AMD Radeon RX 6650 XT +73EF, C2, AMD Radeon RX 6700S +73EF, C3, AMD Radeon RX 6650M +73EF, C4, AMD Radeon RX 6650M XT +73FF, C1, AMD Radeon RX 6600 XT +73FF, C3, AMD Radeon RX 6600M +73FF, C7, AMD Radeon RX 6600 +73FF, CB, AMD Radeon RX 6600S +7408, 00, AMD Instinct MI250X +740C, 01, AMD Instinct MI250X / MI250 +740F, 02, AMD Instinct MI210 +7421, 00, AMD Radeon Pro W6500M +7422, 00, AMD Radeon Pro W6400 +7423, 00, AMD Radeon Pro W6300M +7423, 01, AMD Radeon Pro W6300 +7424, 00, AMD Radeon RX 6300 +743F, C1, AMD Radeon RX 6500 XT +743F, C3, AMD Radeon RX 6500 +743F, C3, AMD Radeon RX 6500M +743F, C7, AMD Radeon RX 6400 +743F, C8, AMD Radeon RX 6500M +743F, CC, AMD Radeon 6550S +743F, CF, AMD Radeon RX 6300M +743F, D7, AMD Radeon RX 6400 +744C, C8, AMD Radeon RX 7900 XTX +744C, CC, AMD Radeon RX 7900 XT +9830, 00, AMD Radeon HD 8400 / R3 Series +9831, 00, AMD Radeon HD 8400E +9832, 00, AMD Radeon HD 8330 +9833, 00, AMD Radeon HD 8330E +9834, 00, AMD Radeon HD 8210 +9835, 00, AMD Radeon HD 8210E +9836, 00, AMD Radeon HD 8200 / R3 Series +9837, 00, AMD Radeon HD 8280E +9838, 00, AMD Radeon HD 8200 / R3 series +9839, 00, AMD Radeon HD 8180 +983D, 00, AMD Radeon HD 8250 +9850, 00, AMD Radeon R3 Graphics +9850, 03, AMD Radeon R3 Graphics +9850, 40, AMD Radeon R2 Graphics +9850, 45, AMD Radeon R3 Graphics +9851, 00, AMD Radeon R4 Graphics +9851, 01, AMD Radeon R5E Graphics +9851, 05, AMD Radeon R5 Graphics +9851, 06, AMD Radeon R5E Graphics +9851, 40, AMD Radeon R4 Graphics +9851, 45, AMD Radeon R5 Graphics +9852, 00, AMD Radeon R2 Graphics +9852, 40, AMD Radeon E1 Graphics +9853, 00, AMD Radeon R2 Graphics +9853, 01, AMD Radeon R4E Graphics +9853, 03, AMD Radeon R2 Graphics +9853, 05, AMD Radeon R1E Graphics +9853, 06, AMD Radeon R1E Graphics +9853, 07, AMD Radeon R1E Graphics +9853, 08, AMD Radeon R1E Graphics +9853, 40, AMD Radeon R2 Graphics +9854, 00, AMD Radeon R3 Graphics +9854, 01, AMD Radeon R3E Graphics +9854, 02, AMD Radeon R3 Graphics +9854, 05, AMD Radeon R2 Graphics +9854, 06, AMD Radeon R4 Graphics +9854, 07, AMD Radeon R3 Graphics +9855, 02, AMD Radeon R6 Graphics +9855, 05, AMD Radeon R4 Graphics +9856, 00, AMD Radeon R2 Graphics +9856, 01, AMD Radeon R2E Graphics +9856, 02, AMD Radeon R2 Graphics +9856, 05, AMD Radeon R1E Graphics +9856, 06, AMD Radeon R2 Graphics +9856, 07, AMD Radeon R1E Graphics +9856, 08, AMD Radeon R1E Graphics +9856, 13, AMD Radeon R1E Graphics +9874, 81, AMD Radeon R6 Graphics +9874, 84, AMD Radeon R7 Graphics +9874, 85, AMD Radeon R6 Graphics +9874, 87, AMD Radeon R5 Graphics +9874, 88, AMD Radeon R7E Graphics +9874, 89, AMD Radeon R6E Graphics +9874, C4, AMD Radeon R7 Graphics +9874, C5, AMD Radeon R6 Graphics +9874, C6, AMD Radeon R6 Graphics +9874, C7, AMD Radeon R5 Graphics +9874, C8, AMD Radeon R7 Graphics +9874, C9, AMD Radeon R7 Graphics +9874, CA, AMD Radeon R5 Graphics +9874, CB, AMD Radeon R5 Graphics +9874, CC, AMD Radeon R7 Graphics +9874, CD, AMD Radeon R7 Graphics +9874, CE, AMD Radeon R5 Graphics +9874, E1, AMD Radeon R7 Graphics +9874, E2, AMD Radeon R7 Graphics +9874, E3, AMD Radeon R7 Graphics +9874, E4, AMD Radeon R7 Graphics +9874, E5, AMD Radeon R5 Graphics +9874, E6, AMD Radeon R5 Graphics +98E4, 80, AMD Radeon R5E Graphics +98E4, 81, AMD Radeon R4E Graphics +98E4, 83, AMD Radeon R2E Graphics +98E4, 84, AMD Radeon R2E Graphics +98E4, 86, AMD Radeon R1E Graphics +98E4, C0, AMD Radeon R4 Graphics +98E4, C1, AMD Radeon R5 Graphics +98E4, C2, AMD Radeon R4 Graphics +98E4, C4, AMD Radeon R5 Graphics +98E4, C6, AMD Radeon R5 Graphics +98E4, C8, AMD Radeon R4 Graphics +98E4, C9, AMD Radeon R4 Graphics +98E4, CA, AMD Radeon R5 Graphics +98E4, D0, AMD Radeon R2 Graphics +98E4, D1, AMD Radeon R2 Graphics +98E4, D2, AMD Radeon R2 Graphics +98E4, D4, AMD Radeon R2 Graphics +98E4, D9, AMD Radeon R5 Graphics +98E4, DA, AMD Radeon R5 Graphics +98E4, DB, AMD Radeon R3 Graphics +98E4, E1, AMD Radeon R3 Graphics +98E4, E2, AMD Radeon R3 Graphics +98E4, E9, AMD Radeon R4 Graphics +98E4, EA, AMD Radeon R4 Graphics +98E4, EB, AMD Radeon R3 Graphics +98E4, EB, AMD Radeon R4 Graphics diff --git a/project/3rdparty/source/libdrm/tools/util/kms.c b/project/3rdparty/source/libdrm/tools/util/kms.c index c0ed781d9..def4b70f7 100644 --- a/project/3rdparty/source/libdrm/tools/util/kms.c +++ b/project/3rdparty/source/libdrm/tools/util/kms.c @@ -83,6 +83,7 @@ static const char *const modules[] = { "mxsfb-drm", "simpledrm", "imx-lcdif", + "vkms", }; int util_open(const char *device, const char *module) diff --git a/project/3rdparty/source/libdrm/xf86drm.c b/project/3rdparty/source/libdrm/xf86drm.c index af235fd56..bf0bd0a59 100644 --- a/project/3rdparty/source/libdrm/xf86drm.c +++ b/project/3rdparty/source/libdrm/xf86drm.c @@ -392,6 +392,10 @@ static char *drmGetFormatModifierNameFromAmd(uint64_t modifier) case AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS: str_tile_version = "GFX10_RBPLUS"; break; + + case AMD_FMT_MOD_TILE_VER_GFX11: + str_tile_version = "GFX11"; + break; } if (str_tile_version) { @@ -422,6 +426,10 @@ static char *drmGetFormatModifierNameFromAmd(uint64_t modifier) case AMD_FMT_MOD_TILE_GFX9_64K_R_X: str_tile = "GFX9_64K_R_X"; break; + + case AMD_FMT_MOD_TILE_GFX11_256K_R_X: + str_tile = "GFX11_256K_R_X"; + break; } if (str_tile) { @@ -474,7 +482,7 @@ static char *drmGetFormatModifierNameFromAmlogic(uint64_t modifier) static char *drmGetFormatModifierNameFromVivante(uint64_t modifier) { - const char *mod_vivante = NULL; + char *mod_vivante = NULL; const char *color_tiling, *tile_status, *compression; switch (modifier & VIVANTE_MOD_TS_MASK) { diff --git a/project/entry/gui_demo/lvgl/benchmark/benchmark.c b/project/entry/gui_demo/lvgl/benchmark/benchmark.c index 742300d6f..3e52d201c 100644 --- a/project/entry/gui_demo/lvgl/benchmark/benchmark.c +++ b/project/entry/gui_demo/lvgl/benchmark/benchmark.c @@ -404,6 +404,7 @@ static void txt_large_cb(void) txt_create(&style_common); } +#if LV_USE_FONT_COMPRESSED static void txt_small_compr_cb(void) { lv_style_reset(&style_common); @@ -427,6 +428,7 @@ static void txt_large_compr_cb(void) lv_style_set_text_opa(&style_common, scene_with_opa ? LV_OPA_50 : LV_OPA_COVER); txt_create(&style_common); } +#endif static void line_cb(void) { @@ -565,9 +567,11 @@ static scene_dsc_t scenes[] = { {.name = "Text medium", .create_cb = txt_medium_cb, .time_sum_normal = 0, .time_sum_opa = 0, .refr_cnt_normal = 0, .refr_cnt_opa = 0, .fps_normal = 0, .fps_opa = 0, .weight = 30}, {.name = "Text large", .create_cb = txt_large_cb, .time_sum_normal = 0, .time_sum_opa = 0, .refr_cnt_normal = 0, .refr_cnt_opa = 0, .fps_normal = 0, .fps_opa = 0, .weight = 20}, +#if LV_USE_FONT_COMPRESSED {.name = "Text small compressed", .create_cb = txt_small_compr_cb, .time_sum_normal = 0, .time_sum_opa = 0, .refr_cnt_normal = 0, .refr_cnt_opa = 0, .fps_normal = 0, .fps_opa = 0, .weight = 3}, {.name = "Text medium compressed", .create_cb = txt_medium_compr_cb, .time_sum_normal = 0, .time_sum_opa = 0, .refr_cnt_normal = 0, .refr_cnt_opa = 0, .fps_normal = 0, .fps_opa = 0, .weight = 5}, {.name = "Text large compressed", .create_cb = txt_large_compr_cb, .time_sum_normal = 0, .time_sum_opa = 0, .refr_cnt_normal = 0, .refr_cnt_opa = 0, .fps_normal = 0, .fps_opa = 0, .weight = 10}, +#endif {.name = "Line", .create_cb = line_cb, .time_sum_normal = 0, .time_sum_opa = 0, .refr_cnt_normal = 0, .refr_cnt_opa = 0, .fps_normal = 0, .fps_opa = 0, .weight = 10}, @@ -881,6 +885,11 @@ static void generate_report(void) if (mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { lv_disp_t *disp = lv_disp_get_default(); disp->driver->flush_cb = flush_cb_ori; + if (disp->refr_timer) { + lv_timer_set_period(disp->refr_timer, disp_ori_timer_period); + } + + lv_timer_set_period(lv_anim_get_timer(), anim_ori_timer_period); } uint32_t i; diff --git a/project/entry/gui_demo/lvgl/benchmark/benchmark.h b/project/entry/gui_demo/lvgl/benchmark/benchmark.h index 6087b0882..556641916 100644 --- a/project/entry/gui_demo/lvgl/benchmark/benchmark.h +++ b/project/entry/gui_demo/lvgl/benchmark/benchmark.h @@ -24,9 +24,11 @@ LV_IMG_DECLARE(img_benchmark_cogwheel_argb); LV_IMG_DECLARE(img_benchmark_cogwheel_indexed16); LV_IMG_DECLARE(img_benchmark_cogwheel_chroma_keyed); +#if LV_USE_FONT_COMPRESSED LV_FONT_DECLARE(lv_font_benchmark_montserrat_12_compr_az); LV_FONT_DECLARE(lv_font_benchmark_montserrat_16_compr_az); LV_FONT_DECLARE(lv_font_benchmark_montserrat_28_compr_az); +#endif typedef enum { // 渲染场景并将它们显示在显示器上。测量渲染时间，但它可能包含LVGL等待驱动程序的额外时间。运行每个场景几秒钟，这样性能也可以用肉眼看到。由于仅测量渲染时间并将其转换为FPS，因此可能会有非常高的值(例如1000FPS） diff --git a/project/gui/awtk/src/widgets/pages.c b/project/gui/awtk/src/widgets/pages.c index 3a441951f..0c08b55a6 100644 --- a/project/gui/awtk/src/widgets/pages.c +++ b/project/gui/awtk/src/widgets/pages.c @@ -183,7 +183,7 @@ static ret_t pages_set_prop(widget_t* widget, const char* name, const value_t* v if (tk_str_eq(name, WIDGET_PROP_VALUE) || tk_str_eq(name, WIDGET_PROP_ACTIVE)) { return pages_set_active(widget, value_int(v)); } else if (tk_str_eq(name, WIDGET_PROP_AUTO_FOCUSED)) { - return pages_set_auto_focused(widget,value_bool(v)); + return pages_set_auto_focused(widget, value_bool(v)); } return RET_NOT_FOUND; @@ -263,8 +263,9 @@ static ret_t pages_on_remove_child(widget_t* widget, widget_t* child) { if (remove_index < active || (remove_index == active && remove_index == widget->children->size - 1)) { active = tk_max(active - 1, 0); - pages->active = (uint32_t)active; + pages_set_active(widget, active); } + widget_dispatch_simple_event(widget, EVT_PAGE_CHANGED); } return RET_CONTINUE; } diff --git a/project/gui/awtk/src/window_manager/window_manager_default.c b/project/gui/awtk/src/window_manager/window_manager_default.c index 74d53e26a..0f8a1fddb 100644 --- a/project/gui/awtk/src/window_manager/window_manager_default.c +++ b/project/gui/awtk/src/window_manager/window_manager_default.c @@ -620,7 +620,13 @@ static ret_t window_manager_default_close_window(widget_t* widget, widget_t* win widget_remove_child(widget, window); idle_add(window_manager_idle_destroy_window, window); /* 这里是解决没有结束动画，但是 prev_win 是高亮的对话框的情况 */ - prev_win = window_manager_get_top_main_window(widget); + prev_win = window_manager_get_top_window(widget); + if (widget_is_keyboard(prev_win)) { + input_method_t* im = input_method(); + if (im->keyboard != NULL && im->keyboard == prev_win) { + prev_win = widget_get_window(im->widget); + } + } if (prev_win != NULL) { if (!widget_is_keyboard(window)) { window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_FOREGROUND); diff --git a/project/gui/lvgl/lvglx/lv_conf.h b/project/gui/lvgl/lvglx/lv_conf.h index 3492d794a..d2b779785 100644 --- a/project/gui/lvgl/lvglx/lv_conf.h +++ b/project/gui/lvgl/lvglx/lv_conf.h @@ -53,6 +53,11 @@ #define LV_STRLEN lv_strlen_builtin #define LV_STRNCPY lv_strncpy_builtin +#define LV_COLOR_EXTERN_INCLUDE +#define LV_COLOR_MIX lv_color_mix +#define LV_COLOR_PREMULT lv_color_premult +#define LV_COLOR_MIX_PREMULT lv_color_mix_premult + // 使用自定义滴答源，以毫秒为单位告诉经过的时间。它消除了使用`lv_tick_inc()`手动更新刻度的需要 #define LV_TICK_CUSTOM 0 diff --git a/project/gui/lvgl/lvglx/lvgl/src/core/lv_obj_style.c b/project/gui/lvgl/lvglx/lvgl/src/core/lv_obj_style.c index 1723947d9..6ce5c4261 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/core/lv_obj_style.c +++ b/project/gui/lvgl/lvglx/lvgl/src/core/lv_obj_style.c @@ -1,6 +1,7 @@ #include "lv_obj.h" #include "lv_disp.h" #include "../misc/lv_gc.h" +#include LV_COLOR_EXTERN_INCLUDE #define MY_CLASS &lv_obj_class @@ -867,7 +868,7 @@ static void trans_anim_cb(void *_tr, int32_t v) } else if (v >= 255) { value_final.color = tr->end_value.color; } else { - value_final.color = lv_color_mix(tr->end_value.color, tr->start_value.color, v); + value_final.color = LV_COLOR_MIX(tr->end_value.color, tr->start_value.color, v); } break; diff --git a/project/gui/lvgl/lvglx/lvgl/src/draw/nxp/pxp/lv_draw_pxp_blend.c b/project/gui/lvgl/lvglx/lvgl/src/draw/nxp/pxp/lv_draw_pxp_blend.c index bde9659a3..835b821c1 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/draw/nxp/pxp/lv_draw_pxp_blend.c +++ b/project/gui/lvgl/lvglx/lvgl/src/draw/nxp/pxp/lv_draw_pxp_blend.c @@ -35,6 +35,7 @@ #if LV_USE_GPU_NXP_PXP #include "lvgl_support.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -478,7 +479,7 @@ static void lv_pxp_blit_cf(lv_color_t * dest_buf, const lv_area_t * dest_area, l if(has_recolor) { /* New color key after recoloring */ - lv_color_t colorKey = lv_color_mix(dsc->recolor, LV_COLOR_CHROMA_KEY, dsc->recolor_opa); + lv_color_t colorKey = LV_COLOR_MIX(dsc->recolor, LV_COLOR_CHROMA_KEY, dsc->recolor_opa); LV_COLOR_SET_R(colorKeyLow, colorKey.ch.red != 0 ? colorKey.ch.red - 1 : 0); LV_COLOR_SET_G(colorKeyLow, colorKey.ch.green != 0 ? colorKey.ch.green - 1 : 0); diff --git a/project/gui/lvgl/lvglx/lvgl/src/draw/sdl/lv_draw_sdl_img.c b/project/gui/lvgl/lvglx/lvgl/src/draw/sdl/lv_draw_sdl_img.c index df00cd594..68acf6bdb 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/draw/sdl/lv_draw_sdl_img.c +++ b/project/gui/lvgl/lvglx/lvgl/src/draw/sdl/lv_draw_sdl_img.c @@ -23,6 +23,7 @@ #include "lv_draw_sdl_composite.h" #include "lv_draw_sdl_rect.h" #include "lv_draw_sdl_layer.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -366,7 +367,7 @@ static void apply_recolor_opa(SDL_Texture * texture, const lv_draw_img_dsc_t * d { if(draw_dsc->recolor_opa > LV_OPA_TRANSP) { /* Draw with mixed recolor */ - lv_color_t recolor = lv_color_mix(draw_dsc->recolor, lv_color_white(), draw_dsc->recolor_opa); + lv_color_t recolor = LV_COLOR_MIX(draw_dsc->recolor, lv_color_white(), draw_dsc->recolor_opa); SDL_SetTextureColorMod(texture, recolor.ch.red, recolor.ch.green, recolor.ch.blue); } else { diff --git a/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_blend.c b/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_blend.c index be42a9589..3b1259991 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_blend.c +++ b/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_blend.c @@ -12,6 +12,7 @@ #include "../../misc/lv_math.h" #include "../../hal/lv_hal_disp.h" #include "../../core/lv_refr.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -59,14 +60,14 @@ static inline lv_color_t color_blend_true_color_multiply(lv_color_t fg, lv_color **********************/ #define FILL_NORMAL_MASK_PX(color) \ if(*mask == LV_OPA_COVER) *dest_buf = color; \ - else *dest_buf = lv_color_mix(color, *dest_buf, *mask); \ + else *dest_buf = LV_COLOR_MIX(color, *dest_buf, *mask); \ mask++; \ dest_buf++; #define MAP_NORMAL_MASK_PX(x) \ if(*mask_tmp_x) { \ if(*mask_tmp_x == LV_OPA_COVER) dest_buf[x] = src_buf[x]; \ - else dest_buf[x] = lv_color_mix(src_buf[x], dest_buf[x], *mask_tmp_x); \ + else dest_buf[x] = LV_COLOR_MIX(src_buf[x], dest_buf[x], *mask_tmp_x); \ } \ mask_tmp_x++; @@ -186,24 +187,24 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(lv_color_t * dest_buf, const lv_ar /*Has opacity*/ else { lv_color_t last_dest_color = lv_color_black(); - lv_color_t last_res_color = lv_color_mix(color, last_dest_color, opa); + lv_color_t last_res_color = LV_COLOR_MIX(color, last_dest_color, opa); #if LV_COLOR_MIX_ROUND_OFS == 0 && LV_COLOR_DEPTH == 16 - /*lv_color_mix work with an optimized algorithm with 16 bit color depth. + /*LV_COLOR_MIX work with an optimized algorithm with 16 bit color depth. *However, it introduces some rounded error on opa. - *Introduce the same error here too to make lv_color_premult produces the same result */ + *Introduce the same error here too to make LV_COLOR_PREMULT produces the same result */ opa = (uint32_t)((uint32_t)opa + 4) >> 3; opa = opa << 3; #endif uint16_t color_premult[3]; - lv_color_premult(color, opa, color_premult); + LV_COLOR_PREMULT(color, opa, color_premult); lv_opa_t opa_inv = 255 - opa; for(y = 0; y < h; y++) { for(x = 0; x < w; x++) { if(last_dest_color.full != dest_buf[x].full) { last_dest_color = dest_buf[x]; - last_res_color = lv_color_mix_premult(color_premult, dest_buf[x], opa_inv); + last_res_color = LV_COLOR_MIX_PREMULT(color_premult, dest_buf[x], opa_inv); } dest_buf[x] = last_res_color; } @@ -284,7 +285,7 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(lv_color_t * dest_buf, const lv_ar (uint32_t)((uint32_t)(*mask) * opa) >> 8; if(*mask != last_mask || last_dest_color.full != dest_buf[x].full) { if(opa_tmp == LV_OPA_COVER) last_res_color = color; - else last_res_color = lv_color_mix(color, dest_buf[x], opa_tmp); + else last_res_color = LV_COLOR_MIX(color, dest_buf[x], opa_tmp); last_mask = *mask; last_dest_color.full = dest_buf[x].full; } @@ -544,7 +545,7 @@ LV_ATTRIBUTE_FAST_MEM static void map_normal(lv_color_t * dest_buf, const lv_are else { for(y = 0; y < h; y++) { for(x = 0; x < w; x++) { - dest_buf[x] = lv_color_mix(src_buf[x], dest_buf[x], opa); + dest_buf[x] = LV_COLOR_MIX(src_buf[x], dest_buf[x], opa); } dest_buf += dest_stride; src_buf += src_stride; @@ -604,7 +605,7 @@ LV_ATTRIBUTE_FAST_MEM static void map_normal(lv_color_t * dest_buf, const lv_are for(x = 0; x < w; x++) { if(mask[x]) { lv_opa_t opa_tmp = mask[x] >= LV_OPA_MAX ? opa : ((opa * mask[x]) >> 8); - dest_buf[x] = lv_color_mix(src_buf[x], dest_buf[x], opa_tmp); + dest_buf[x] = LV_COLOR_MIX(src_buf[x], dest_buf[x], opa_tmp); } } dest_buf += dest_stride; @@ -867,7 +868,7 @@ static inline lv_color_t color_blend_true_color_additive(lv_color_t fg, lv_color if(opa == LV_OPA_COVER) return fg; - return lv_color_mix(fg, bg, opa); + return LV_COLOR_MIX(fg, bg, opa); } static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_color_t bg, lv_opa_t opa) @@ -886,7 +887,7 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co if(opa == LV_OPA_COVER) return fg; - return lv_color_mix(fg, bg, opa); + return LV_COLOR_MIX(fg, bg, opa); } static inline lv_color_t color_blend_true_color_multiply(lv_color_t fg, lv_color_t bg, lv_opa_t opa) @@ -909,5 +910,5 @@ static inline lv_color_t color_blend_true_color_multiply(lv_color_t fg, lv_color if(opa == LV_OPA_COVER) return fg; - return lv_color_mix(fg, bg, opa); + return LV_COLOR_MIX(fg, bg, opa); } diff --git a/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_img.c b/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_img.c index eebebfcf4..72192c168 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_img.c +++ b/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_img.c @@ -16,6 +16,7 @@ #include "../../misc/lv_mem.h" #include "../../misc/lv_math.h" #include "../lv_draw_transform.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -165,11 +166,11 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_img_decoded(struct _lv_draw_ctx_t * draw_c uint16_t premult_v[3]; lv_opa_t recolor_opa = draw_dsc->recolor_opa; lv_color_t recolor = draw_dsc->recolor; - lv_color_premult(recolor, recolor_opa, premult_v); + LV_COLOR_PREMULT(recolor, recolor_opa, premult_v); recolor_opa = 255 - recolor_opa; uint32_t i; for(i = 0; i < buf_size; i++) { - rgb_buf[i] = lv_color_mix_premult(premult_v, rgb_buf[i], recolor_opa); + rgb_buf[i] = LV_COLOR_MIX_PREMULT(premult_v, rgb_buf[i], recolor_opa); } } #if LV_USE_DRAW_MASKS diff --git a/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_transform.c b/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_transform.c index fcb0b963a..bdab429f5 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_transform.c +++ b/project/gui/lvgl/lvglx/lvgl/src/draw/sw/lv_draw_sw_transform.c @@ -12,6 +12,7 @@ #include "../../misc/lv_assert.h" #include "../../misc/lv_area.h" #include "../../core/lv_refr.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -432,9 +433,9 @@ static void argb_and_rgb_aa(const uint8_t * src, lv_coord_t src_w, lv_coord_t sr cbuf[x] = c_base; } else { - c_ver = lv_color_mix(c_ver, c_base, ys_fract); - c_hor = lv_color_mix(c_hor, c_base, xs_fract); - cbuf[x] = lv_color_mix(c_hor, c_ver, LV_OPA_50); + c_ver = LV_COLOR_MIX(c_ver, c_base, ys_fract); + c_hor = LV_COLOR_MIX(c_hor, c_base, xs_fract); + cbuf[x] = LV_COLOR_MIX(c_hor, c_ver, LV_OPA_50); } } /*Partially out of the image*/ diff --git a/project/gui/lvgl/lvglx/lvgl/src/draw/swm341_dma2d/lv_gpu_swm341_dma2d.c b/project/gui/lvgl/lvglx/lvgl/src/draw/swm341_dma2d/lv_gpu_swm341_dma2d.c index 0d468d72b..2d1aee19c 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/draw/swm341_dma2d/lv_gpu_swm341_dma2d.c +++ b/project/gui/lvgl/lvglx/lvgl/src/draw/swm341_dma2d/lv_gpu_swm341_dma2d.c @@ -200,7 +200,7 @@ static void lv_draw_swm341_dma2d_blend_map(lv_color_t * dest_buf, const lv_area_ DMA2D->L[DMA2D_LAYER_FG].OR = src_stride - dest_w; DMA2D->L[DMA2D_LAYER_FG].PFCCR = (LV_DMA2D_COLOR_FORMAT << DMA2D_PFCCR_CFMT_Pos) /*alpha mode 2, replace with foreground * alpha value*/ - | (2 << DAM2D_PFCCR_AMODE_Pos) + | (2 << DMA2D_PFCCR_AMODE_Pos) /*alpha value*/ | (opa << DMA2D_PFCCR_ALPHA_Pos); diff --git a/project/gui/lvgl/lvglx/lvgl/src/lv_conf_internal.h b/project/gui/lvgl/lvglx/lvgl/src/lv_conf_internal.h index befca0269..8233bc0d3 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/lv_conf_internal.h +++ b/project/gui/lvgl/lvglx/lvgl/src/lv_conf_internal.h @@ -260,6 +260,35 @@ #endif #endif +#ifndef LV_COLOR_EXTERN_INCLUDE + #ifdef CONFIG_LV_COLOR_EXTERN_INCLUDE + #define LV_COLOR_EXTERN_INCLUDE CONFIG_LV_COLOR_EXTERN_INCLUDE + #else + #define LV_COLOR_EXTERN_INCLUDE + #endif +#endif +#ifndef LV_COLOR_MIX + #ifdef CONFIG_LV_COLOR_MIX + #define LV_COLOR_MIX CONFIG_LV_COLOR_MIX + #else + #define LV_COLOR_MIX lv_color_mix + #endif +#endif +#ifndef LV_COLOR_PREMULT + #ifdef CONFIG_LV_COLOR_PREMULT + #define LV_COLOR_PREMULT CONFIG_LV_COLOR_PREMULT + #else + #define LV_COLOR_PREMULT lv_color_premult + #endif +#endif +#ifndef LV_COLOR_MIX_PREMULT + #ifdef CONFIG_LV_COLOR_MIX_PREMULT + #define LV_COLOR_MIX_PREMULT CONFIG_LV_COLOR_MIX_PREMULT + #else + #define LV_COLOR_MIX_PREMULT lv_color_mix_premult + #endif +#endif + /*==================== HAL SETTINGS *====================*/ diff --git a/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.c b/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.c index 1c620e44e..9b61dfc6c 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.c +++ b/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.c @@ -8,6 +8,7 @@ *********************/ #include "lv_color.h" #include "lv_log.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -125,12 +126,12 @@ LV_ATTRIBUTE_FAST_MEM void lv_color_fill(lv_color_t * buf, lv_color_t color, uin lv_color_t lv_color_lighten(lv_color_t c, lv_opa_t lvl) { - return lv_color_mix(lv_color_white(), c, lvl); + return LV_COLOR_MIX(lv_color_white(), c, lvl); } lv_color_t lv_color_darken(lv_color_t c, lv_opa_t lvl) { - return lv_color_mix(lv_color_black(), c, lvl); + return LV_COLOR_MIX(lv_color_black(), c, lvl); } lv_color_t lv_color_change_lightness(lv_color_t c, lv_opa_t lvl) diff --git a/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.h b/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.h index 1569d8b43..a65337afd 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.h +++ b/project/gui/lvgl/lvglx/lvgl/src/misc/lv_color.h @@ -508,7 +508,7 @@ LV_ATTRIBUTE_FAST_MEM static inline void lv_color_mix_with_alpha(lv_color_t bg_c } /*Opaque background: use simple mix*/ else if(bg_opa >= LV_OPA_MAX) { - *res_color = lv_color_mix(fg_color, bg_color, fg_opa); + *res_color = LV_COLOR_MIX(fg_color, bg_color, fg_opa); *res_opa = LV_OPA_COVER; } /*Both colors have alpha. Expensive calculation need to be applied*/ @@ -532,7 +532,7 @@ LV_ATTRIBUTE_FAST_MEM static inline void lv_color_mix_with_alpha(lv_color_t bg_c res_opa_saved = 255 - ((uint16_t)((uint16_t)(255 - fg_opa) * (255 - bg_opa)) >> 8); LV_ASSERT(res_opa_saved != 0); lv_opa_t ratio = (uint16_t)((uint16_t)fg_opa * 255) / res_opa_saved; - res_color_saved = lv_color_mix(fg_color, bg_color, ratio); + res_color_saved = LV_COLOR_MIX(fg_color, bg_color, ratio); } diff --git a/project/gui/lvgl/lvglx/lvgl/src/themes/default/lv_theme_default.c b/project/gui/lvgl/lvglx/lvgl/src/themes/default/lv_theme_default.c index 9b2f325b7..7df99d532 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/themes/default/lv_theme_default.c +++ b/project/gui/lvgl/lvglx/lvgl/src/themes/default/lv_theme_default.c @@ -12,6 +12,7 @@ #include "lv_theme_default.h" #include "../../misc/lv_gc.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -196,8 +197,8 @@ static lv_color_t dark_color_filter_cb(const lv_color_filter_dsc_t * f, lv_color static lv_color_t grey_filter_cb(const lv_color_filter_dsc_t * f, lv_color_t color, lv_opa_t opa) { LV_UNUSED(f); - if(theme.flags & MODE_DARK) return lv_color_mix(lv_palette_darken(LV_PALETTE_GREY, 2), color, opa); - else return lv_color_mix(lv_palette_lighten(LV_PALETTE_GREY, 2), color, opa); + if(theme.flags & MODE_DARK) return LV_COLOR_MIX(lv_palette_darken(LV_PALETTE_GREY, 2), color, opa); + else return LV_COLOR_MIX(lv_palette_lighten(LV_PALETTE_GREY, 2), color, opa); } static void style_init(void) diff --git a/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.c b/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.c index cc4cfbeb5..e628add97 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.c +++ b/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.c @@ -103,7 +103,7 @@ void lv_bar_set_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim) if(bar->cur_value == value) return; value = LV_CLAMP(bar->min_value, value, bar->max_value); - value = value < bar->start_value ? bar->start_value : value; /*Can't be smaller then the left value*/ + value = value < bar->start_value ? bar->start_value : value; /*Can't be smaller than the left value*/ if(bar->cur_value == value) return; lv_bar_set_value_with_anim(obj, value, &bar->cur_value, &bar->cur_value_anim, anim); @@ -120,7 +120,7 @@ void lv_bar_set_start_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim } value = LV_CLAMP(bar->min_value, value, bar->max_value); - value = value > bar->cur_value ? bar->cur_value : value; /*Can't be greater then the right value*/ + value = value > bar->cur_value ? bar->cur_value : value; /*Can't be greater than the right value*/ if(bar->start_value == value) return; lv_bar_set_value_with_anim(obj, value, &bar->start_value, &bar->start_value_anim, anim); @@ -131,6 +131,7 @@ void lv_bar_set_range(lv_obj_t * obj, int32_t min, int32_t max) LV_ASSERT_OBJ(obj, MY_CLASS); lv_bar_t * bar = (lv_bar_t *)obj; + if(max < min) { LV_LOG_WARN("error range: min = %" LV_PRId32 ", max = %" LV_PRId32, min, max); return; @@ -336,8 +337,7 @@ static void draw_indic(lv_event_t * e) anim_start_value_x += anim_start_value_start_x; } - else - { + else { anim_start_value_x = (int32_t)((int32_t)anim_length * (bar->start_value - bar->min_value)) / range; } @@ -351,8 +351,7 @@ static void draw_indic(lv_event_t * e) bar->cur_value_anim.anim_state) / LV_BAR_ANIM_STATE_END); } - else - { + else { anim_cur_value_x = (int32_t)((int32_t)anim_length * (bar->cur_value - bar->min_value)) / range; } @@ -408,13 +407,15 @@ static void draw_indic(lv_event_t * e) /*Do not draw a zero length indicator but at least call the draw part events*/ if(!sym && indic_length_calc(&bar->indic_area) <= 1) { - lv_obj_draw_part_dsc_t obj_draw_dsc; - lv_obj_draw_dsc_init(&obj_draw_dsc, draw_ctx); - obj_draw_dsc.part = LV_PART_INDICATOR; - obj_draw_dsc.draw_area = &bar->indic_area; + lv_obj_draw_part_dsc_t part_draw_dsc; + lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx); + part_draw_dsc.part = LV_PART_INDICATOR; + part_draw_dsc.class_p = MY_CLASS; + part_draw_dsc.type = LV_BAR_DRAW_PART_INDICATOR; + part_draw_dsc.draw_area = &bar->indic_area; - lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc); - lv_event_send(obj, LV_EVENT_DRAW_PART_END, &obj_draw_dsc); + lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc); + lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc); return; } @@ -425,13 +426,15 @@ static void draw_indic(lv_event_t * e) lv_draw_rect_dsc_init(&draw_rect_dsc); lv_obj_init_draw_rect_dsc(obj, LV_PART_INDICATOR, &draw_rect_dsc); - lv_obj_draw_part_dsc_t obj_draw_dsc; - lv_obj_draw_dsc_init(&obj_draw_dsc, draw_ctx); - obj_draw_dsc.part = LV_PART_INDICATOR; - obj_draw_dsc.rect_dsc = &draw_rect_dsc; - obj_draw_dsc.draw_area = &bar->indic_area; + lv_obj_draw_part_dsc_t part_draw_dsc; + lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx); + part_draw_dsc.part = LV_PART_INDICATOR; + part_draw_dsc.class_p = MY_CLASS; + part_draw_dsc.type = LV_BAR_DRAW_PART_INDICATOR; + part_draw_dsc.rect_dsc = &draw_rect_dsc; + part_draw_dsc.draw_area = &bar->indic_area; - lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc); + lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc); lv_coord_t bg_radius = lv_obj_get_style_radius(obj, LV_PART_MAIN); lv_coord_t short_side = LV_MIN(barw, barh); @@ -501,6 +504,9 @@ static void draw_indic(lv_event_t * e) int16_t mask_indic_id = lv_draw_mask_add(&mask_indic_param, NULL); #endif + const lv_area_t * clip_area_ori = draw_ctx->clip_area; + draw_ctx->clip_area = &bar->indic_area; + lv_draw_rect(draw_ctx, &draw_rect_dsc, &mask_indic_max_area); draw_rect_dsc.border_opa = border_opa; draw_rect_dsc.shadow_opa = shadow_opa; @@ -518,7 +524,9 @@ static void draw_indic(lv_event_t * e) lv_draw_mask_remove_id(mask_bg_id); #endif - lv_event_send(obj, LV_EVENT_DRAW_PART_END, &obj_draw_dsc); + draw_ctx->clip_area = clip_area_ori; + + lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc); } static void lv_bar_event(const lv_obj_class_t * class_p, lv_event_t * e) @@ -539,7 +547,7 @@ static void lv_bar_event(const lv_obj_class_t * class_p, lv_event_t * e) indic_size = lv_obj_calculate_ext_draw_size(obj, LV_PART_INDICATOR); /*Bg size is handled by lv_obj*/ - lv_coord_t * s = (lv_coord_t *)lv_event_get_param(e); + lv_coord_t * s = lv_event_get_param(e); *s = LV_MAX(*s, indic_size); /*Calculate the indicator area*/ @@ -552,24 +560,26 @@ static void lv_bar_event(const lv_obj_class_t * class_p, lv_event_t * e) if(pad < 0) { *s = LV_MAX(*s, -pad); } - } else if(code == LV_EVENT_PRESSED || code == LV_EVENT_RELEASED) { + } + else if(code == LV_EVENT_PRESSED || code == LV_EVENT_RELEASED) { lv_bar_t * bar = (lv_bar_t *)obj; lv_obj_invalidate_area(obj, &bar->indic_area); - } else if(code == LV_EVENT_DRAW_MAIN) { + } + else if(code == LV_EVENT_DRAW_MAIN) { draw_indic(e); } } static void lv_bar_anim(void * var, int32_t value) { - _lv_bar_anim_t * bar_anim = (_lv_bar_anim_t *)var; + _lv_bar_anim_t * bar_anim = var; bar_anim->anim_state = value; lv_obj_invalidate(bar_anim->bar); } static void lv_bar_anim_ready(lv_anim_t * a) { - _lv_bar_anim_t * var = (_lv_bar_anim_t *)a->var; + _lv_bar_anim_t * var = a->var; lv_obj_t * obj = (lv_obj_t *)var->bar; lv_bar_t * bar = (lv_bar_t *)obj; @@ -586,7 +596,7 @@ static void lv_bar_set_value_with_anim(lv_obj_t * obj, int32_t new_value, int32_ { if(en == LV_ANIM_OFF) { *value_ptr = new_value; - lv_obj_invalidate((lv_obj_t*)obj); + lv_obj_invalidate((lv_obj_t *)obj); /*Stop the previous animation if it exists*/ lv_anim_del(anim_info, NULL); @@ -627,8 +637,4 @@ static void lv_bar_init_anim(lv_obj_t * obj, _lv_bar_anim_t * bar_anim) bar_anim->anim_state = LV_BAR_ANIM_STATE_INV; } -#ifdef __cplusplus -} -#endif - #endif diff --git a/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.h b/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.h index d17e39d94..24e7d654a 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.h +++ b/project/gui/lvgl/lvglx/lvgl/src/widgets/bar/lv_bar.h @@ -53,16 +53,24 @@ typedef struct { _lv_bar_anim_t cur_value_anim; _lv_bar_anim_t start_value_anim; lv_bar_mode_t mode : 2; /**< Type of bar*/ -}lv_bar_t; +} lv_bar_t; extern const lv_obj_class_t lv_bar_class; +/** + * `type` field in `lv_obj_draw_part_dsc_t` if `class_p = lv_bar_class` + * Used in `LV_EVENT_DRAW_PART_BEGIN` and `LV_EVENT_DRAW_PART_END` + */ +typedef enum { + LV_BAR_DRAW_PART_INDICATOR, /**< The indicator*/ +} lv_bar_draw_part_type_t; + /********************** * GLOBAL PROTOTYPES **********************/ /** - * Create a bar objects + * Create a bar object * @param parent pointer to an object, it will be the parent of the new bar * @return pointer to the created bar */ diff --git a/project/gui/lvgl/lvglx/lvgl/src/widgets/led/lv_led.c b/project/gui/lvgl/lvglx/lvgl/src/widgets/led/lv_led.c index 76295eebd..47ca04eac 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/widgets/led/lv_led.c +++ b/project/gui/lvgl/lvglx/lvgl/src/widgets/led/lv_led.c @@ -11,6 +11,7 @@ #include "../../misc/lv_assert.h" #include "../../themes/lv_themes.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -180,20 +181,20 @@ static void lv_led_event(const lv_obj_class_t * class_p, lv_event_t * e) lv_obj_init_draw_rect_dsc(obj, LV_PART_MAIN, &rect_dsc); /*Use the original colors brightness to modify color->led*/ - rect_dsc.bg_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_color)); - rect_dsc.bg_grad.stops[0].color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_grad.stops[0].color)); - rect_dsc.bg_grad.stops[1].color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_grad.stops[1].color)); - rect_dsc.shadow_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.shadow_color)); - rect_dsc.border_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.border_color)); - rect_dsc.outline_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.outline_color)); + rect_dsc.bg_color = LV_COLOR_MIX(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_color)); + rect_dsc.bg_grad.stops[0].color = LV_COLOR_MIX(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_grad.stops[0].color)); + rect_dsc.bg_grad.stops[1].color = LV_COLOR_MIX(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_grad.stops[1].color)); + rect_dsc.shadow_color = LV_COLOR_MIX(led->color, lv_color_black(), lv_color_brightness(rect_dsc.shadow_color)); + rect_dsc.border_color = LV_COLOR_MIX(led->color, lv_color_black(), lv_color_brightness(rect_dsc.border_color)); + rect_dsc.outline_color = LV_COLOR_MIX(led->color, lv_color_black(), lv_color_brightness(rect_dsc.outline_color)); /*Mix. the color with black proportionally with brightness*/ - rect_dsc.bg_color = lv_color_mix(rect_dsc.bg_color, lv_color_black(), led->bright); - rect_dsc.bg_grad.stops[0].color = lv_color_mix(rect_dsc.bg_grad.stops[0].color, lv_color_black(), led->bright); - rect_dsc.bg_grad.stops[1].color = lv_color_mix(rect_dsc.bg_grad.stops[1].color, lv_color_black(), led->bright); - rect_dsc.border_color = lv_color_mix(rect_dsc.border_color, lv_color_black(), led->bright); - rect_dsc.shadow_color = lv_color_mix(rect_dsc.shadow_color, lv_color_black(), led->bright); - rect_dsc.outline_color = lv_color_mix(rect_dsc.outline_color, lv_color_black(), led->bright); + rect_dsc.bg_color = LV_COLOR_MIX(rect_dsc.bg_color, lv_color_black(), led->bright); + rect_dsc.bg_grad.stops[0].color = LV_COLOR_MIX(rect_dsc.bg_grad.stops[0].color, lv_color_black(), led->bright); + rect_dsc.bg_grad.stops[1].color = LV_COLOR_MIX(rect_dsc.bg_grad.stops[1].color, lv_color_black(), led->bright); + rect_dsc.border_color = LV_COLOR_MIX(rect_dsc.border_color, lv_color_black(), led->bright); + rect_dsc.shadow_color = LV_COLOR_MIX(rect_dsc.shadow_color, lv_color_black(), led->bright); + rect_dsc.outline_color = LV_COLOR_MIX(rect_dsc.outline_color, lv_color_black(), led->bright); /*Set the current shadow width according to brightness proportionally between LV_LED_BRIGHT_OFF * and LV_LED_BRIGHT_ON*/ diff --git a/project/gui/lvgl/lvglx/lvgl/src/widgets/meter/lv_meter.c b/project/gui/lvgl/lvglx/lvgl/src/widgets/meter/lv_meter.c index 37509e086..7dc33fb06 100644 --- a/project/gui/lvgl/lvglx/lvgl/src/widgets/meter/lv_meter.c +++ b/project/gui/lvgl/lvglx/lvgl/src/widgets/meter/lv_meter.c @@ -10,6 +10,7 @@ #if LV_USE_METER != 0 #include "../../misc/lv_assert.h" +#include LV_COLOR_EXTERN_INCLUDE /********************* * DEFINES @@ -455,7 +456,7 @@ static void draw_ticks_and_labels(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, cons else { ratio = lv_map(value_of_line, meter->scale.min, meter->scale.max, LV_OPA_TRANSP, LV_OPA_COVER); } - line_color = lv_color_mix(indic->type_data.scale_lines.color_end, indic->type_data.scale_lines.color_start, ratio); + line_color = LV_COLOR_MIX(indic->type_data.scale_lines.color_end, indic->type_data.scale_lines.color_start, ratio); } } }