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/grey_core.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/grey_core.c')
-rw-r--r-- | apps/plugins/lib/grey_core.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index 9686f1d021..e3543aeba2 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c | |||
@@ -765,6 +765,11 @@ static const unsigned char colorindex[4] = {128, 85, 43, 0}; | |||
765 | content (b&w and greyscale overlay) to an 8-bit BMP file. */ | 765 | content (b&w and greyscale overlay) to an 8-bit BMP file. */ |
766 | static void grey_screendump_hook(int fd) | 766 | static void grey_screendump_hook(int fd) |
767 | { | 767 | { |
768 | fb_data *lcd_fb; | ||
769 | struct viewport *vp_main = rb->lcd_set_viewport(NULL); | ||
770 | rb->viewport_set_fullscreen(vp_main, SCREEN_MAIN); | ||
771 | lcd_fb = vp_main->buffer->fb_ptr; | ||
772 | |||
768 | int i; | 773 | int i; |
769 | int y, gx, gy; | 774 | int y, gx, gy; |
770 | #if LCD_PIXELFORMAT == VERTICAL_PACKING | 775 | #if LCD_PIXELFORMAT == VERTICAL_PACKING |
@@ -845,7 +850,7 @@ static void grey_screendump_hook(int fd) | |||
845 | gsrc = _grey_info.values + _GREY_MULUQ(_grey_info.width, gy); | 850 | gsrc = _grey_info.values + _GREY_MULUQ(_grey_info.width, gy); |
846 | 851 | ||
847 | #if LCD_DEPTH == 2 | 852 | #if LCD_DEPTH == 2 |
848 | src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_FBWIDTH, y); | 853 | src = lcd_fb + _GREY_MULUQ(LCD_FBWIDTH, y); |
849 | 854 | ||
850 | do | 855 | do |
851 | { | 856 | { |
@@ -876,7 +881,7 @@ static void grey_screendump_hook(int fd) | |||
876 | 881 | ||
877 | #if LCD_DEPTH == 1 | 882 | #if LCD_DEPTH == 1 |
878 | mask = BIT_N(y & 7); | 883 | mask = BIT_N(y & 7); |
879 | src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 3); | 884 | src = lcd_fb + _GREY_MULUQ(LCD_WIDTH, y >> 3); |
880 | 885 | ||
881 | do | 886 | do |
882 | { | 887 | { |
@@ -908,7 +913,7 @@ static void grey_screendump_hook(int fd) | |||
908 | 913 | ||
909 | #elif LCD_DEPTH == 2 | 914 | #elif LCD_DEPTH == 2 |
910 | shift = 2 * (y & 3); | 915 | shift = 2 * (y & 3); |
911 | src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 2); | 916 | src = lcd_fb + _GREY_MULUQ(LCD_WIDTH, y >> 2); |
912 | 917 | ||
913 | do | 918 | do |
914 | { | 919 | { |
@@ -933,7 +938,7 @@ static void grey_screendump_hook(int fd) | |||
933 | 938 | ||
934 | #if LCD_DEPTH == 2 | 939 | #if LCD_DEPTH == 2 |
935 | shift = y & 7; | 940 | shift = y & 7; |
936 | src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 3); | 941 | src = lcd_fb + _GREY_MULUQ(LCD_WIDTH, y >> 3); |
937 | 942 | ||
938 | do | 943 | do |
939 | { | 944 | { |