fix(esp_lvgl_port): Add support for LVGL 9.2 and above

Author: tore-espressif

components/esp_lvgl_port/CHANGELOG.md

@@ -1,9 +1,10 @@
 # Changelog
 
-## 2.5.0
+## 2.5.0 [Unreleased]
 
 ### Features (Functional change for button v4 users)
 - Updated LVGL port for using IoT button component v4 (LVGL port not anymore creating button, need to be created in app and included handle to LVGL port)
+- Added SIMD support also for LVGL 9.2 and above
 
 ### Fixes
 - Fixed buffer size by selected color format

components/esp_lvgl_port/CMakeLists.txt

@@ -24,7 +24,7 @@ endif()
 
 if("${lvgl_ver}" STREQUAL "")
     message("Could not determine LVGL version, assuming v9.x")
-    set(lvgl_ver "9.0.0")
+    set(lvgl_ver "9.1.0") # With 9.1 we assume support for SIMD acceleration
 endif()
 
 # Select folder by LVGL version
@@ -76,10 +76,9 @@ if("usb_host_hid" IN_LIST build_components)
     list(APPEND ADD_LIBS idf::usb_host_hid)
 endif()
 
-# Include SIMD assembly source code for rendering, only for (9.1.0 <= LVG_version < 9.2.0) and only for esp32 and esp32s3
-if((lvgl_ver VERSION_GREATER_EQUAL "9.1.0") AND (lvgl_ver VERSION_LESS "9.2.0"))
+# Include SIMD assembly source code for rendering, only for LVGL_version >= 9.1.0 and only for esp32 and esp32s3
+if((lvgl_ver VERSION_GREATER_EQUAL "9.1.0"))
     if(CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S3)
-        message(VERBOSE "Compiling SIMD")
         if(CONFIG_IDF_TARGET_ESP32S3)
             file(GLOB_RECURSE ASM_SRCS ${PORT_PATH}/simd/*_esp32s3.S)    # Select only esp32s3 related files
         else()

components/esp_lvgl_port/include/esp_lvgl_port_lv_blend.h

@@ -18,6 +18,19 @@ extern "C" {
 #warning "esp_lvgl_port_lv_blend.h included, but CONFIG_LV_DRAW_SW_ASM_CUSTOM not set. Assembly rendering not used"
 #else
 
+#include "lvgl.h"
+
+/**
+ * LVGL 9.2 changed the blending API compared to 9.1
+ * The types were moved to lv_draw_sw_blend_private.h
+ * and the leading underscore from type names was removed
+ */
+#if __has_include("draw/sw/blend/lv_draw_sw_blend_private.h")
+#include "draw/sw/blend/lv_draw_sw_blend_private.h"
+#define _lv_draw_sw_blend_fill_dsc_t lv_draw_sw_blend_fill_dsc_t
+#define _lv_draw_sw_blend_image_dsc_t lv_draw_sw_blend_image_dsc_t
+#endif
+
 /*********************
  *      DEFINES
  *********************/

examples/display_lvgl_demos/main/CMakeLists.txt

@@ -1,17 +1,3 @@
-set(LV_DEMO_DIR "")
-set(LV_DEMOS_SOURCES "")
-if(CONFIG_LV_USE_DEMO_BENCHMARK)
-    list(APPEND LV_DEMO_DIR ../managed_components/lvgl__lvgl/demos)
-    file(GLOB_RECURSE LV_DEMOS_SOURCES ${LV_DEMO_DIR}/*.c)
-endif()
-
 idf_component_register(
-    SRCS "dispaly_lvgl_demos_main.c" ${LV_DEMOS_SOURCES}
-    INCLUDE_DIRS "." ${LV_DEMO_DIR})
-
-if(CONFIG_LV_USE_DEMO_BENCHMARK)
-set_source_files_properties(
-    ${LV_DEMOS_SOURCES}
-    PROPERTIES COMPILE_OPTIONS
-    -DLV_LVGL_H_INCLUDE_SIMPLE)
-endif()
+    SRCS "display_lvgl_demos_main.c"
+    INCLUDE_DIRS ".")