feat(sdl_render): support all draw task types #6437

kisvegabor · 2024-06-27T21:49:51Z

Description of the feature or fix

I'm working on adding support to all draw task types, but I'm facing a cache related issue. The current code crashes in lv_example_buttonmatrix_1() if this line is enabled:

==34516==ERROR: AddressSanitizer: heap-use-after-free on address 0x60600001e100 at pc 0x559d6a5c9864 bp 0x7ffeda3e96c0 sp 0x7ffeda3e96b0
READ of size 4 at 0x60600001e100 thread T0
    #0 0x559d6a5c9863 in lv_cache_entry_get_ref ../lvgl/src/misc/cache/lv_cache_entry.c:71
    #1 0x559d6a5c79f8 in get_victim_cb ../lvgl/src/misc/cache/_lv_cache_lru_rb.c:420
    #2 0x559d6a5c91df in cache_evict_one_internal_no_lock ../lvgl/src/misc/cache/lv_cache.c:319
    #3 0x559d6a5c9414 in cache_add_internal_no_lock ../lvgl/src/misc/cache/lv_cache.c:342
    #4 0x559d6a5c86ea in lv_cache_acquire_or_create ../lvgl/src/misc/cache/lv_cache.c:173
    #5 0x559d6a7dd55f in draw_from_cached_texture ../lvgl/src/draw/sdl/lv_draw_sdl.c:406
    #6 0x559d6a7de33e in execute_drawing ../lvgl/src/draw/sdl/lv_draw_sdl.c:479

I'd like to immediately drop the cache in some case. In this case with text_local = 1 the label_draw_dsc->text will be freed later, so we cannot keep a reference to it in the draw_dsc saved in the cache..

Other thing: In sdl_texture_cache_compare_cb I'd like to compare text of the label draw dsc-s with strcmp and not by pointer value. Can I simply return return strcmp_res > 0 ? 1 : -1;?

cc @W-Mai

Notes

Update the Documentation if needed.
Add Examples if relevant.
Add Tests if applicable.
If you added new options to lv_conf_template.h run lv_conf_internal_gen.py and update Kconfig.
Run scripts/code-format.py (astyle version v3.4.12 needs to be installed) and follow the Code Conventions.
Mark the Pull request as Draft while you are working on the first version, and mark is as Ready when it's ready for review.
When changes were requested, re-request review to notify the maintainers.
Help us to review this Pull Request! Anyone can approve or request changes.

kisvegabor · 2024-07-12T15:57:55Z

@W-Mai will you have time to take a look at it in the near future?

lhdjply · 2024-07-15T08:28:59Z

After testing, it was found that the system freezes and images do not rotate. I have attempted to fix these two issues, please test again

From 876d0c6397e80ad1c3c38af33e9bc1db770ca91a Mon Sep 17 00:00:00 2001
From: lhdjply <lhdjply@126.com>
Date: Mon, 15 Jul 2024 16:24:08 +0800
Subject: [PATCH] fix freezing issues and add image rotation functionality.

Signed-off-by: lhdjply <lhdjply@126.com>
---
 demos/widgets/lv_demo_widgets.c |  4 ++--
 src/draw/sdl/lv_draw_sdl.c      | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c
index eb0e880d6..be4ebf75f 100644
--- a/demos/widgets/lv_demo_widgets.c
+++ b/demos/widgets/lv_demo_widgets.c
@@ -252,8 +252,8 @@ static void profile_create(lv_obj_t * parent)
 
     LV_IMAGE_DECLARE(img_demo_widgets_avatar);
     lv_obj_t * avatar = lv_image_create(panel1);
-    //    lv_image_set_src(avatar, &img_demo_widgets_avatar);
-    lv_image_set_src(avatar, "A:lvgl/demos/widgets/assets/avatar.png");
+    lv_image_set_src(avatar, &img_demo_widgets_avatar);
+    //    lv_image_set_src(avatar, "A:lvgl/demos/widgets/assets/avatar.png")
 
     lv_obj_t * name = lv_label_create(panel1);
     lv_label_set_text(name, "Elena Smith");
diff --git a/src/draw/sdl/lv_draw_sdl.c b/src/draw/sdl/lv_draw_sdl.c
index 511dd064c..d685ff31f 100644
--- a/src/draw/sdl/lv_draw_sdl.c
+++ b/src/draw/sdl/lv_draw_sdl.c
@@ -345,8 +345,8 @@ static bool draw_to_texture(lv_draw_sdl_unit_t * u, cache_data_t * cache_data)
 
     cache_data->draw_dsc = lv_malloc(base_dsc->dsc_size);
     lv_memcpy((void *)cache_data->draw_dsc, base_dsc, base_dsc->dsc_size);
-    cache_data->w = texture_w;
-    cache_data->h = texture_h;
+    cache_data->w = lv_area_get_width(&task->area);
+    cache_data->h = lv_area_get_height(&task->area);
     cache_data->texture = texture;
 
     if(obj) {
@@ -441,7 +441,8 @@ static void draw_from_cached_texture(lv_draw_sdl_unit_t * u)
         rect.h = lv_area_get_height(&image_area);
 
         SDL_RenderSetClipRect(renderer, &clip_rect);
-        SDL_RenderCopy(renderer, texture, NULL, &rect);
+        SDL_Point center = {draw_dsc->pivot.x, draw_dsc->pivot.y};
+        SDL_RenderCopyEx(renderer, texture, NULL, &rect, draw_dsc->rotation / 10, &center, SDL_FLIP_NONE);
     }
     else {
         rect.x = t->_real_area.x1 - dest_layer->buf_area.x1;
@@ -460,12 +461,9 @@ static void draw_from_cached_texture(lv_draw_sdl_unit_t * u)
         lv_draw_label_dsc_t * label_dsc = t->draw_dsc;
         if(label_dsc->text_local) {
             //          lv_cache_entry_set_invalid(entry_cached, true);
-            printf("a\n");
         }
     }
-    printf("b\n");
     lv_cache_release(u->texture_cache, entry_cached, u);
-    printf("c\n");
 }
 
 static void execute_drawing(lv_draw_sdl_unit_t * u)
-- 
2.43.0

W-Mai · 2024-07-16T12:17:46Z

src/draw/sdl/lv_draw_sdl.c

+    if(t->type == LV_DRAW_TASK_TYPE_LABEL) {
+        lv_draw_label_dsc_t * label_dsc = t->draw_dsc;
+        if(label_dsc->text_local) {
+            //          lv_cache_entry_set_invalid(entry_cached, true);


this API is private, don't use

kisvegabor · 2024-07-17T16:02:17Z

I resolved the caching issue by using lv_cache_drop.

I've also added support for image rotation. It's done by LVGL not SDL to make sure that all SW render features are supported.

lhdjply · 2024-07-18T00:20:18Z

I resolved the caching issue by using lv_cache_drop.

I've also added support for image rotation. It's done by LVGL not SDL to make sure that all SW render features are supported.

Nice!

Currently, two issues have been identified:

The application also crashes when the window is resized or when the maximize button is clicked.
The lv_demo_transform example does not allow for scaling.

kisvegabor · 2024-07-29T09:54:00Z

Thanks, I've fixed both.

lhdjply · 2024-07-30T00:41:34Z

Test passed. Please rebase onto the master branch to resolve conflicts.

sliang951753 · 2024-08-05T16:07:17Z

hello,
I have two questions regarding the SDL support for LVGL.

I 'm wondering why using SDL_RENDERER_SOFTWARE flag in SDL_CreateRenderer() function ? As my test, I found when changing it to SDL_RENDERER_ACCELERATED, the FPS will be more stable than using SDL_RENDERER_SOFTWARE (Not enable SDL DRAW ).
After trying to use the latest fix feat(sdl_render): support all draw task types #6437, I found the performance was worse than software rendering. Especially the score of "Container with opa_layer" was super low. It looks the drawing operation spent more time than using pure software rendering and the flush operation is very fast with SDL draw.

kisvegabor · 2024-08-13T10:29:20Z

I'll test the performance issue tomorrow.

kisvegabor · 2024-08-14T14:02:24Z

I've significantly improved the perfornace. opa_layered still could be faster, but I think it's okay for the first round.

XuNeo · 2024-08-22T14:01:54Z

src/draw/sdl/lv_draw_sdl.c

@@ -9,13 +9,13 @@
 #include "../lv_draw_private.h"
 #if LV_USE_DRAW_SDL
 #include LV_SDL_INCLUDE_PATH
-#include <SDL2/SDL_image.h>


Please confirm it's remove as intended.

Confirmed. It was one of the goals to get rid of SDL_image.

Confirmed. It was one of the goals to get rid of SDL_image.

Can it be removed from lv_dsl_window.c, tests/CMakeLists.txt, and scripts/install-prerequisites.sh too?

XuNeo · 2024-08-22T14:02:25Z

demos/widgets/lv_demo_widgets.c

@@ -998,11 +997,11 @@ void shop_create(lv_obj_t * parent)
    lv_obj_add_style(title, &style_title, 0);

    LV_IMAGE_DECLARE(img_clothes);
-    create_shop_item(list, &img_clothes, "Blue jeans", "Clothes", "$722");


Please revert unnecessary changes.

XuNeo · 2024-08-22T14:02:47Z

examples/widgets/image/lv_example_image_1.c

+
+    //    lv_obj_t * img2 = lv_image_create(lv_screen_active());
+    //    lv_image_set_src(img2, LV_SYMBOL_OK "Accept");
+    //    lv_obj_align_to(img2, img1, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);


Let's cleanup a bit.

XuNeo · 2024-08-22T14:03:41Z

src/draw/sdl/lv_draw_sdl.c

 {
+    static int32_t x = 0;
+    printf("%d\n", x++);


XuNeo · 2024-08-22T14:03:56Z

src/draw/sdl/lv_draw_sdl.c

                break;
            }
        default:
            return false;
    }

+


kisvegabor · 2024-08-23T07:42:33Z

Updated, please review again.

liamHowatt

Please update the Kconfig.

liamHowatt · 2024-08-23T16:18:19Z

src/draw/sdl/lv_draw_sdl.c

@@ -9,13 +9,13 @@
 #include "../lv_draw_private.h"
 #if LV_USE_DRAW_SDL
 #include LV_SDL_INCLUDE_PATH
-#include <SDL2/SDL_image.h>


Confirmed. It was one of the goals to get rid of SDL_image.

Can it be removed from lv_dsl_window.c, tests/CMakeLists.txt, and scripts/install-prerequisites.sh too?

src/draw/sdl/lv_draw_sdl.c

kisvegabor · 2024-08-23T19:59:28Z

Thank you Liam, all fixed.

liamHowatt

Sorry, just this leftover now: https://github.com/kisvegabor/lvgl_upstream/blob/850272c7ed430be07bc45b9d3c05461297aa0cbf/tests/CMakeLists.txt#L463

kisvegabor · 2024-08-23T21:19:33Z

Fixed

kisvegabor · 2024-08-26T08:46:32Z

Force merging now for v9.2. There shouldn't be major issues.

Kirbyrawr · 2024-08-31T12:35:23Z

I noticed heavy performance degradation in basic screens from 9.1 to 9.2.
In 9.1 i was getting 30 fps using SDL in Windows and Linux.
In 9.2 i'm getting 6 fps without changing any part of the code.

Let me know if you need more details but i wanted to put it here just in case is related.

kisvegabor · 2024-09-02T16:15:25Z

Wow, that's not ideal for sure. Can you run perf on Linux to see what takes so long?

Could you try LV_SDL_ACCELERATED 0 or 1 and make sure that LV_COLOR_DEPTH is 32.

This was referenced Jun 28, 2024

When using LV_USE_DRAW_SDL, all images cannot be displayed. lvgl/lv_port_pc_vscode#44

Open

Draw arc not working if LV_DRAW_SDL is enabled. #6410

Closed

W-Mai reviewed Jul 16, 2024

View reviewed changes

kisvegabor mentioned this pull request Jul 19, 2024

Significant performance difference between V8.3 and V9 when using SDL #6524

Closed

kisvegabor added 9 commits August 14, 2024 15:56

add other line, triangle, and shadow drawing

3999342

fix crash

1054297

remove SDL_image

d4dc5b5

fix widget demo typo

9a8a4f1

use simple fill directly

76bf105

handle layer scale

6016a4f

fix window resizing

b832344

optimize performance

4ffe7c1

fix warnings

f16fa63

kisvegabor force-pushed the feat/sdl-draw-complete branch from 25811db to f16fa63 Compare August 14, 2024 14:00

fix CI

750ddfe

kisvegabor requested review from XuNeo, FASTSHIFT and liamHowatt August 21, 2024 13:43

Merge branch 'master' into feat/sdl-draw-complete

e889056

XuNeo reviewed Aug 22, 2024

View reviewed changes

revert lv_example_image_1.c

8d3ee06

minor fixes

35d8247

liamHowatt reviewed Aug 23, 2024

View reviewed changes

fixes based on feedback

9f1b31c

update Kconfig

850272c

liamHowatt reviewed Aug 23, 2024

View reviewed changes

minor fix

2f7139b

liamHowatt approved these changes Aug 23, 2024

View reviewed changes

kisvegabor requested a review from XuNeo August 23, 2024 22:34

kisvegabor merged commit 51f06c0 into lvgl:master Aug 26, 2024
20 checks passed

kisvegabor deleted the feat/sdl-draw-complete branch August 26, 2024 08:46

kisvegabor mentioned this pull request Sep 5, 2024

Finalize SDL rendering #6016

Closed

rodb70 pushed a commit to rodb70/lvgl that referenced this pull request Nov 8, 2024

feat(sdl_render): support all draw task types (lvgl#6437)

e45bc71

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(sdl_render): support all draw task types #6437

feat(sdl_render): support all draw task types #6437

kisvegabor commented Jun 27, 2024 •

edited

Loading

kisvegabor commented Jul 12, 2024

lhdjply commented Jul 15, 2024 •

edited

Loading

W-Mai Jul 16, 2024

kisvegabor commented Jul 17, 2024

lhdjply commented Jul 18, 2024

kisvegabor commented Jul 29, 2024

lhdjply commented Jul 30, 2024

sliang951753 commented Aug 5, 2024

kisvegabor commented Aug 13, 2024

kisvegabor commented Aug 14, 2024

XuNeo Aug 22, 2024

kisvegabor Aug 23, 2024

liamHowatt Aug 23, 2024

XuNeo Aug 22, 2024

XuNeo Aug 22, 2024

XuNeo Aug 22, 2024

XuNeo Aug 22, 2024

kisvegabor commented Aug 23, 2024

liamHowatt left a comment

liamHowatt Aug 23, 2024

kisvegabor commented Aug 23, 2024

liamHowatt left a comment

kisvegabor commented Aug 23, 2024

kisvegabor commented Aug 26, 2024

Kirbyrawr commented Aug 31, 2024

kisvegabor commented Sep 2, 2024

feat(sdl_render): support all draw task types #6437

feat(sdl_render): support all draw task types #6437

Conversation

kisvegabor commented Jun 27, 2024 • edited Loading

Description of the feature or fix

Notes

kisvegabor commented Jul 12, 2024

lhdjply commented Jul 15, 2024 • edited Loading

Choose a reason for hiding this comment

kisvegabor commented Jul 17, 2024

lhdjply commented Jul 18, 2024

kisvegabor commented Jul 29, 2024

lhdjply commented Jul 30, 2024

sliang951753 commented Aug 5, 2024

kisvegabor commented Aug 13, 2024

kisvegabor commented Aug 14, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kisvegabor commented Aug 23, 2024

liamHowatt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kisvegabor commented Aug 23, 2024

liamHowatt left a comment

Choose a reason for hiding this comment

kisvegabor commented Aug 23, 2024

kisvegabor commented Aug 26, 2024

Kirbyrawr commented Aug 31, 2024

kisvegabor commented Sep 2, 2024

kisvegabor commented Jun 27, 2024 •

edited

Loading

lhdjply commented Jul 15, 2024 •

edited

Loading