From 3237ae4a4ff9296a377ff9194a11038da161208f Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Wed, 7 Oct 2020 02:01:35 -0400 Subject: 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 --- apps/plugins/lib/grey_core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'apps/plugins/lib/grey_core.c') 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}; content (b&w and greyscale overlay) to an 8-bit BMP file. */ static void grey_screendump_hook(int fd) { + fb_data *lcd_fb; + struct viewport *vp_main = rb->lcd_set_viewport(NULL); + rb->viewport_set_fullscreen(vp_main, SCREEN_MAIN); + lcd_fb = vp_main->buffer->fb_ptr; + int i; int y, gx, gy; #if LCD_PIXELFORMAT == VERTICAL_PACKING @@ -845,7 +850,7 @@ static void grey_screendump_hook(int fd) gsrc = _grey_info.values + _GREY_MULUQ(_grey_info.width, gy); #if LCD_DEPTH == 2 - src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_FBWIDTH, y); + src = lcd_fb + _GREY_MULUQ(LCD_FBWIDTH, y); do { @@ -876,7 +881,7 @@ static void grey_screendump_hook(int fd) #if LCD_DEPTH == 1 mask = BIT_N(y & 7); - src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 3); + src = lcd_fb + _GREY_MULUQ(LCD_WIDTH, y >> 3); do { @@ -908,7 +913,7 @@ static void grey_screendump_hook(int fd) #elif LCD_DEPTH == 2 shift = 2 * (y & 3); - src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 2); + src = lcd_fb + _GREY_MULUQ(LCD_WIDTH, y >> 2); do { @@ -933,7 +938,7 @@ static void grey_screendump_hook(int fd) #if LCD_DEPTH == 2 shift = y & 7; - src = *rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 3); + src = lcd_fb + _GREY_MULUQ(LCD_WIDTH, y >> 3); do { -- cgit v1.2.3