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/sys_rockbox.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/sys_rockbox.c')
-rw-r--r-- | apps/plugins/rockboy/sys_rockbox.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index 364176ce2d..64acd37563 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c | |||
@@ -282,6 +282,12 @@ fb_data *frameb; | |||
282 | void vid_update(int scanline) | 282 | void vid_update(int scanline) |
283 | { | 283 | { |
284 | register int cnt=0; | 284 | register int cnt=0; |
285 | static fb_data *lcd_fb = NULL; | ||
286 | if (!lcd_fb) | ||
287 | { | ||
288 | struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport); | ||
289 | lcd_fb = vp_main->buffer->fb_ptr; | ||
290 | } | ||
285 | int scanline_remapped; | 291 | int scanline_remapped; |
286 | #if (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) /* Archos, Clip, m200v4 */ | 292 | #if (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) /* Archos, Clip, m200v4 */ |
287 | int balance = 0; | 293 | int balance = 0; |
@@ -290,7 +296,7 @@ void vid_update(int scanline) | |||
290 | else if (fb.mode==2) | 296 | else if (fb.mode==2) |
291 | scanline-=8; | 297 | scanline-=8; |
292 | scanline_remapped = scanline / 16; | 298 | scanline_remapped = scanline / 16; |
293 | frameb = *rb->lcd_framebuffer + scanline_remapped * LCD_WIDTH; | 299 | frameb = lcd_fb + scanline_remapped * LCD_WIDTH; |
294 | while (cnt < 160) { | 300 | while (cnt < 160) { |
295 | balance += LCD_WIDTH; | 301 | balance += LCD_WIDTH; |
296 | if (balance > 0) | 302 | if (balance > 0) |
@@ -316,7 +322,7 @@ void vid_update(int scanline) | |||
316 | else if (fb.mode==2) | 322 | else if (fb.mode==2) |
317 | scanline-=8; | 323 | scanline-=8; |
318 | scanline_remapped = scanline / 4; | 324 | scanline_remapped = scanline / 4; |
319 | frameb = *rb->lcd_framebuffer + scanline_remapped * LCD_WIDTH; | 325 | frameb = lcd_fb + scanline_remapped * LCD_WIDTH; |
320 | while (cnt < 160) { | 326 | while (cnt < 160) { |
321 | *(frameb++) = (scan.buf[0][cnt]&0x3) | | 327 | *(frameb++) = (scan.buf[0][cnt]&0x3) | |
322 | ((scan.buf[1][cnt]&0x3)<<2) | | 328 | ((scan.buf[1][cnt]&0x3)<<2) | |