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/plugin.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/plugin.c')
-rw-r--r-- | apps/plugin.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 48f9dac487..4a50c2b3a3 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -194,9 +194,7 @@ static const struct plugin_api rockbox_api = { | |||
194 | lcd_putsf, | 194 | lcd_putsf, |
195 | lcd_puts_scroll, | 195 | lcd_puts_scroll, |
196 | lcd_scroll_stop, | 196 | lcd_scroll_stop, |
197 | &lcd_framebuffer, | ||
198 | lcd_set_viewport, | 197 | lcd_set_viewport, |
199 | lcd_set_framebuffer, | ||
200 | lcd_bmp_part, | 198 | lcd_bmp_part, |
201 | lcd_update_rect, | 199 | lcd_update_rect, |
202 | lcd_set_drawmode, | 200 | lcd_set_drawmode, |
@@ -281,7 +279,6 @@ static const struct plugin_api rockbox_api = { | |||
281 | lcd_remote_mono_bitmap_part, | 279 | lcd_remote_mono_bitmap_part, |
282 | lcd_remote_mono_bitmap, | 280 | lcd_remote_mono_bitmap, |
283 | lcd_remote_putsxy, | 281 | lcd_remote_putsxy, |
284 | &lcd_remote_framebuffer; | ||
285 | lcd_remote_update, | 282 | lcd_remote_update, |
286 | lcd_remote_update_rect, | 283 | lcd_remote_update_rect, |
287 | #if (LCD_REMOTE_DEPTH > 1) | 284 | #if (LCD_REMOTE_DEPTH > 1) |
@@ -303,6 +300,7 @@ static const struct plugin_api rockbox_api = { | |||
303 | viewportmanager_theme_enable, | 300 | viewportmanager_theme_enable, |
304 | viewportmanager_theme_undo, | 301 | viewportmanager_theme_undo, |
305 | viewport_set_fullscreen, | 302 | viewport_set_fullscreen, |
303 | viewport_set_buffer, | ||
306 | 304 | ||
307 | #ifdef HAVE_BACKLIGHT | 305 | #ifdef HAVE_BACKLIGHT |
308 | /* lcd backlight */ | 306 | /* lcd backlight */ |
@@ -869,11 +867,12 @@ int plugin_load(const char* plugin, const void* parameter) | |||
869 | #endif | 867 | #endif |
870 | 868 | ||
871 | *(p_hdr->api) = &rockbox_api; | 869 | *(p_hdr->api) = &rockbox_api; |
872 | 870 | lcd_set_viewport(NULL); | |
873 | lcd_clear_display(); | 871 | lcd_clear_display(); |
874 | lcd_update(); | 872 | lcd_update(); |
875 | 873 | ||
876 | #ifdef HAVE_REMOTE_LCD | 874 | #ifdef HAVE_REMOTE_LCD |
875 | lcd_remote_set_viewport(NULL); | ||
877 | lcd_remote_clear_display(); | 876 | lcd_remote_clear_display(); |
878 | lcd_remote_update(); | 877 | lcd_remote_update(); |
879 | #endif | 878 | #endif |
@@ -914,7 +913,8 @@ int plugin_load(const char* plugin, const void* parameter) | |||
914 | #ifdef HAVE_TOUCHSCREEN | 913 | #ifdef HAVE_TOUCHSCREEN |
915 | touchscreen_set_mode(global_settings.touch_mode); | 914 | touchscreen_set_mode(global_settings.touch_mode); |
916 | #endif | 915 | #endif |
917 | 916 | /* restore default vp */ | |
917 | lcd_set_viewport(NULL); | ||
918 | screen_helper_setfont(FONT_UI); | 918 | screen_helper_setfont(FONT_UI); |
919 | #if LCD_DEPTH > 1 | 919 | #if LCD_DEPTH > 1 |
920 | #ifdef HAVE_LCD_COLOR | 920 | #ifdef HAVE_LCD_COLOR |
@@ -928,6 +928,8 @@ int plugin_load(const char* plugin, const void* parameter) | |||
928 | #endif /* LCD_DEPTH */ | 928 | #endif /* LCD_DEPTH */ |
929 | 929 | ||
930 | #ifdef HAVE_REMOTE_LCD | 930 | #ifdef HAVE_REMOTE_LCD |
931 | lcd_remote_set_viewport(NULL); | ||
932 | |||
931 | #if LCD_REMOTE_DEPTH > 1 | 933 | #if LCD_REMOTE_DEPTH > 1 |
932 | lcd_remote_set_drawinfo(DRMODE_SOLID, LCD_REMOTE_DEFAULT_FG, | 934 | lcd_remote_set_drawinfo(DRMODE_SOLID, LCD_REMOTE_DEFAULT_FG, |
933 | LCD_REMOTE_DEFAULT_BG); | 935 | LCD_REMOTE_DEFAULT_BG); |