diff options
author | William Wilgus <wilgus.william@gmail.com> | 2020-10-07 02:01:35 -0400 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2020-10-26 12:28:48 -0400 |
commit | 3237ae4a4ff9296a377ff9194a11038da161208f (patch) | |
tree | af4338c78467b9b0845d76c39da1fbe10f25e23e /apps/plugins/lib/xlcd_draw.c | |
parent | 12f3ed1699d6bef25bed90ba95cbcc1a6bb4934a (diff) | |
download | rockbox-3237ae4a4ff9296a377ff9194a11038da161208f.tar.gz rockbox-3237ae4a4ff9296a377ff9194a11038da161208f.zip |
LCD core move buf ptr and address look up function viewport struct
I'm currently running up against the limitations of the lcd_draw functions
I want these functions to be able to be used on any size buffer not
just buffers with a stride matching the underlying device
[DONE] allow the framebuffer to be decoupled from the device framebuffer
[DONE need examples] allow for some simple blit like transformations
[DONE] remove the device framebuffer from the plugin api
[DONE}ditto remote framebuffer
[DONE] remove _viewport_get_framebuffer you can call struct *vp = lcd_set_viewport(NULL) and vp->buffer->fb_ptr
while remote lcds may compile (and work in the sim) its not been tested on targets
[FIXED] backdrops need work to be screen agnostic
[FIXED] screen statusbar is not being combined into the main viewport correctly yet
[FIXED] screen elements are displayed incorrectly after switch to void*
[FIXED] core didn't restore proper viewport on splash etc.
[NEEDS TESTING] remote lcd garbled data
[FIXED] osd lib garbled screen on bmp_part
[FIXED] grey_set_vp needs to return old viewport like lcd_set_viewport
[FIXED] Viewport update now handles viewports with differing buffers/strides by copying to the main buffer
[FIXED] splash on top of WPS leaves old framebuffer data (doesn't redraw)
[UPDATE] refined this a bit more to have clear_viewport set the clean bit and have skin_render do its own screen clear
scrolling viewports no longer trigger wps refresh
also fixed a bug where guisyncyesno was displaying and then disappearing
[ADDED!] New LCD macros that allow you to create properly size frame buffers in you desired size without wasting bytes
(LCD_ and LCD_REMOTE_)
LCD_STRIDE(w, h) same as STRIDE_MAIN
LCD_FBSTRIDE(w, h) returns target specific stride for a buffer W x H
LCD_NBELEMS(w, h) returns the number of fb_data sized elemenst needed for a buffer W x H
LCD_NATIVE_STRIDE(s) conversion between rockbox native vertical and lcd native stride (2bitH)
test_viewports.c has an example of usage
[FIXED!!] 2bit targets don't respect non-native strides
[FIXED] Few define snags
Change-Id: I0d04c3834e464eca84a5a715743a297a0cefd0af
Diffstat (limited to 'apps/plugins/lib/xlcd_draw.c')
-rw-r--r-- | apps/plugins/lib/xlcd_draw.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/plugins/lib/xlcd_draw.c b/apps/plugins/lib/xlcd_draw.c index b6ed403353..0bd1c7a9e2 100644 --- a/apps/plugins/lib/xlcd_draw.c +++ b/apps/plugins/lib/xlcd_draw.c | |||
@@ -349,6 +349,9 @@ static const fb_data graylut[256] = { | |||
349 | void xlcd_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, | 349 | void xlcd_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, |
350 | int stride, int x, int y, int width, int height) | 350 | int stride, int x, int y, int width, int height) |
351 | { | 351 | { |
352 | size_t dst_stride; | ||
353 | fb_data *lcd_fb = get_framebuffer(NULL, &dst_stride); | ||
354 | |||
352 | const unsigned char *src_end; | 355 | const unsigned char *src_end; |
353 | fb_data *dst; | 356 | fb_data *dst; |
354 | 357 | ||
@@ -377,7 +380,7 @@ void xlcd_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, | |||
377 | 380 | ||
378 | src += stride * src_y + src_x; /* move starting point */ | 381 | src += stride * src_y + src_x; /* move starting point */ |
379 | src_end = src + stride * height; | 382 | src_end = src + stride * height; |
380 | dst = *rb->lcd_framebuffer + LCD_WIDTH * y + x; | 383 | dst = lcd_fb + dst_stride * y + x; |
381 | 384 | ||
382 | do | 385 | do |
383 | { | 386 | { |
@@ -398,7 +401,7 @@ void xlcd_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, | |||
398 | #endif | 401 | #endif |
399 | 402 | ||
400 | src += stride; | 403 | src += stride; |
401 | dst += LCD_WIDTH; | 404 | dst += dst_stride; |
402 | } | 405 | } |
403 | while (src < src_end); | 406 | while (src < src_end); |
404 | } | 407 | } |
@@ -416,6 +419,9 @@ void xlcd_gray_bitmap(const unsigned char *src, int x, int y, int width, | |||
416 | void xlcd_color_bitmap_part(const unsigned char *src, int src_x, int src_y, | 419 | void xlcd_color_bitmap_part(const unsigned char *src, int src_x, int src_y, |
417 | int stride, int x, int y, int width, int height) | 420 | int stride, int x, int y, int width, int height) |
418 | { | 421 | { |
422 | size_t dst_stride; | ||
423 | fb_data *lcd_fb = get_framebuffer(NULL, &dst_stride); | ||
424 | |||
419 | const unsigned char *src_end; | 425 | const unsigned char *src_end; |
420 | fb_data *dst; | 426 | fb_data *dst; |
421 | 427 | ||
@@ -444,7 +450,7 @@ void xlcd_color_bitmap_part(const unsigned char *src, int src_x, int src_y, | |||
444 | 450 | ||
445 | src += 3 * (stride * src_y + src_x); /* move starting point */ | 451 | src += 3 * (stride * src_y + src_x); /* move starting point */ |
446 | src_end = src + 3 * stride * height; | 452 | src_end = src + 3 * stride * height; |
447 | dst = *rb->lcd_framebuffer + LCD_WIDTH * y + x; | 453 | dst = lcd_fb + dst_stride * y + x; |
448 | 454 | ||
449 | do | 455 | do |
450 | { | 456 | { |
@@ -471,7 +477,7 @@ void xlcd_color_bitmap_part(const unsigned char *src, int src_x, int src_y, | |||
471 | while (src_row < row_end); | 477 | while (src_row < row_end); |
472 | 478 | ||
473 | src += 3 * stride; | 479 | src += 3 * stride; |
474 | dst += LCD_WIDTH; | 480 | dst += dst_stride; |
475 | } | 481 | } |
476 | while (src < src_end); | 482 | while (src < src_end); |
477 | } | 483 | } |