chore(conf): default align to 1 instead of 4

Default to 1 to make it behave same to lvgl v8. To avoid confusions raised in lvgl/lv_binding_micropython#313 Signed-off-by: Xu Xingliang <xuxingliang@xiaomi.com>
XuNeo · Jan 11, 2024 · 439ecea · 439ecea
1 parent 87e9d54
commit 439ecea
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.devcontainer/__lv_conf.h__ b/.devcontainer/__lv_conf.h__
@@ -76,7 +76,7 @@
 #define LV_DRAW_BUF_STRIDE_ALIGN                1
 
 /*Align the start address of draw_buf addresses to this bytes*/
-#define LV_DRAW_BUF_ALIGN                       4
+#define LV_DRAW_BUF_ALIGN                       1
 
 #define LV_USE_DRAW_SW 1
 #if LV_USE_DRAW_SW == 1

diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h
@@ -79,7 +79,7 @@
 #define LV_DRAW_BUF_STRIDE_ALIGN                1
 
 /*Align the start address of draw_buf addresses to this bytes*/
-#define LV_DRAW_BUF_ALIGN                       4
+#define LV_DRAW_BUF_ALIGN                       1
 
 #define LV_USE_DRAW_SW 1
 #if LV_USE_DRAW_SW == 1

diff --git a/lv_conf_template.h b/lv_conf_template.h
@@ -75,7 +75,7 @@
 #define LV_DRAW_BUF_STRIDE_ALIGN                1
 
 /*Align the start address of draw_buf addresses to this bytes*/
-#define LV_DRAW_BUF_ALIGN                       4
+#define LV_DRAW_BUF_ALIGN                       1
 
 #define LV_USE_DRAW_SW 1
 #if LV_USE_DRAW_SW == 1

diff --git a/src/draw/lv_draw_buf.c b/src/draw/lv_draw_buf.c
@@ -382,12 +382,16 @@ static void * buf_align(void * buf, lv_color_format_t color_format)
 {
     LV_UNUSED(color_format);
 
+#if LV_DRAW_BUF_ALIGN == 1
+    return buf;
+#else
     uint8_t * buf_u8 = buf;
     if(buf_u8) {
         buf_u8 += LV_DRAW_BUF_ALIGN - 1;
         buf_u8 = (uint8_t *)((lv_uintptr_t) buf_u8 & ~(LV_DRAW_BUF_ALIGN - 1));
     }
     return buf_u8;
+#endif
 }
 
 static uint32_t width_to_stride(uint32_t w, lv_color_format_t color_format)

diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h
@@ -208,10 +208,14 @@
 
 /*Align the start address of draw_buf addresses to this bytes*/
 #ifndef LV_DRAW_BUF_ALIGN
-    #ifdef CONFIG_LV_DRAW_BUF_ALIGN
-        #define LV_DRAW_BUF_ALIGN CONFIG_LV_DRAW_BUF_ALIGN
+    #ifdef _LV_KCONFIG_PRESENT
+        #ifdef CONFIG_LV_DRAW_BUF_ALIGN
+            #define LV_DRAW_BUF_ALIGN CONFIG_LV_DRAW_BUF_ALIGN
+        #else
+            #define LV_DRAW_BUF_ALIGN 0
+        #endif
     #else
-        #define LV_DRAW_BUF_ALIGN                       4
+        #define LV_DRAW_BUF_ALIGN                       1
     #endif
 #endif