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/rockboy/lcd.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/rockboy/lcd.c')
-rw-r--r-- | apps/plugins/rockboy/lcd.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c index 387a88c3df..92db851ee8 100644 --- a/apps/plugins/rockboy/lcd.c +++ b/apps/plugins/rockboy/lcd.c | |||
@@ -64,6 +64,12 @@ unsigned char *vdest; | |||
64 | fb_data *vdest; | 64 | fb_data *vdest; |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | static fb_data* get_framebuffer(void) | ||
68 | { | ||
69 | struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport); | ||
70 | return vp_main->buffer->fb_ptr; | ||
71 | } | ||
72 | |||
67 | #ifndef ASM_UPDATEPATPIX | 73 | #ifndef ASM_UPDATEPATPIX |
68 | static void updatepatpix(void) ICODE_ATTR; | 74 | static void updatepatpix(void) ICODE_ATTR; |
69 | static void updatepatpix(void) | 75 | static void updatepatpix(void) |
@@ -741,10 +747,11 @@ static void spr_scan(void) | |||
741 | 747 | ||
742 | void lcd_begin(void) | 748 | void lcd_begin(void) |
743 | { | 749 | { |
750 | fb_data *lcd_fb = get_framebuffer(); | ||
744 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 751 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
745 | vdest=(unsigned char*)*rb->lcd_framebuffer; | 752 | vdest=(unsigned char*)lcd_fb; |
746 | #else | 753 | #else |
747 | vdest=*rb->lcd_framebuffer; | 754 | vdest=lcd_fb; |
748 | #endif | 755 | #endif |
749 | 756 | ||
750 | #ifdef HAVE_LCD_COLOR | 757 | #ifdef HAVE_LCD_COLOR |
@@ -975,9 +982,9 @@ void lcd_refreshline(void) | |||
975 | 982 | ||
976 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 983 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
977 | if(options.scaling==3) { | 984 | if(options.scaling==3) { |
978 | rb->lcd_blit_pal256((unsigned char*)*rb->lcd_framebuffer,(LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, (LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, 160, 144); | 985 | rb->lcd_blit_pal256((unsigned char*)lcd_fb,(LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, (LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, 160, 144); |
979 | } else { | 986 | } else { |
980 | rb->lcd_blit_pal256((unsigned char*)*rb->lcd_framebuffer,0,0,0,0,LCD_WIDTH,LCD_HEIGHT); | 987 | rb->lcd_blit_pal256((unsigned char*)lcd_fb,0,0,0,0,LCD_WIDTH,LCD_HEIGHT); |
981 | } | 988 | } |
982 | #else | 989 | #else |
983 | if(options.scaling==3) { | 990 | if(options.scaling==3) { |