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/plasma.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/plasma.c')
-rw-r--r-- | apps/plugins/plasma.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 9e2e3832a3..f944d3d775 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -36,6 +36,8 @@ | |||
36 | 36 | ||
37 | 37 | ||
38 | /******************************* Globals ***********************************/ | 38 | /******************************* Globals ***********************************/ |
39 | static fb_data *lcd_fb; | ||
40 | |||
39 | 41 | ||
40 | static unsigned char wave_array[256]; /* Pre calculated wave array */ | 42 | static unsigned char wave_array[256]; /* Pre calculated wave array */ |
41 | #ifdef HAVE_LCD_COLOR | 43 | #ifdef HAVE_LCD_COLOR |
@@ -201,9 +203,9 @@ int main(void) | |||
201 | #ifdef HAVE_LCD_COLOR | 203 | #ifdef HAVE_LCD_COLOR |
202 | shades_generate(time++); /* dynamically */ | 204 | shades_generate(time++); /* dynamically */ |
203 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 205 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
204 | ptr = (unsigned char*)*rb->lcd_framebuffer; | 206 | ptr = (unsigned char*)lcd_fb; |
205 | #else | 207 | #else |
206 | ptr = *rb->lcd_framebuffer; | 208 | ptr = lcd_fb; |
207 | #endif | 209 | #endif |
208 | 210 | ||
209 | #else | 211 | #else |
@@ -237,7 +239,7 @@ int main(void) | |||
237 | p4-=sp4; | 239 | p4-=sp4; |
238 | #ifdef HAVE_LCD_COLOR | 240 | #ifdef HAVE_LCD_COLOR |
239 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 241 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
240 | rb->lcd_blit_pal256( (unsigned char*)*rb->lcd_framebuffer, | 242 | rb->lcd_blit_pal256( (unsigned char*)lcd_fb, |
241 | 0,0,0,0,LCD_WIDTH,LCD_HEIGHT); | 243 | 0,0,0,0,LCD_WIDTH,LCD_HEIGHT); |
242 | #else | 244 | #else |
243 | rb->lcd_update(); | 245 | rb->lcd_update(); |
@@ -326,5 +328,8 @@ enum plugin_status plugin_start(const void* parameter) | |||
326 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 328 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
327 | rb->lcd_set_mode(LCD_MODE_PAL256); | 329 | rb->lcd_set_mode(LCD_MODE_PAL256); |
328 | #endif | 330 | #endif |
331 | struct viewport *vp_main = rb->lcd_set_viewport(NULL); | ||
332 | lcd_fb = vp_main->buffer->fb_ptr; | ||
333 | |||
329 | return main(); | 334 | return main(); |
330 | } | 335 | } |