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/zxbox/zxvid_2bpp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'apps/plugins/zxbox/zxvid_2bpp.c') diff --git a/apps/plugins/zxbox/zxvid_2bpp.c b/apps/plugins/zxbox/zxvid_2bpp.c index 9772625387..97e6a5de76 100644 --- a/apps/plugins/zxbox/zxvid_2bpp.c +++ b/apps/plugins/zxbox/zxvid_2bpp.c @@ -26,6 +26,8 @@ static const unsigned char graylevels[16] = { 0, 1, 1, 1, 2, 2, 3, 3 }; +static fb_data *lcd_fb = NULL; + void init_spect_scr(void) { int i; @@ -41,6 +43,11 @@ void init_spect_scr(void) } void update_screen(void) { + if (!lcd_fb) + { + struct viewport *vp_main = rb->lcd_set_viewport(NULL); + lcd_fb = vp_main->buffer->fb_ptr; + } fb_data *frameb; int y=0; int x=0; @@ -51,7 +58,7 @@ void update_screen(void) #if LCD_PIXELFORMAT == HORIZONTAL_PACKING for(y = 0; y < LCD_HEIGHT; y++) { - frameb = *rb->lcd_framebuffer + (y) * FB_WIDTH; + frameb = lcd_fb + (y) * FB_WIDTH; srcx = 0; /* reset our x counter before each row... */ for(x = 0; x < LCD_WIDTH; x++) { @@ -67,7 +74,7 @@ void update_screen(void) int shift; for(y = 0; y < LCD_HEIGHT; y++) { - frameb = *rb->lcd_framebuffer + (y/4) * LCD_WIDTH; + frameb = lcd_fb + (y/4) * LCD_WIDTH; srcx = 0; /* reset our x counter before each row... */ shift = ((y & 3 ) * 2 ); mask = ~pixmask[y & 3]; @@ -84,7 +91,7 @@ void update_screen(void) int shift; for(y = 0; y < LCD_HEIGHT; y++) { - frameb = *rb->lcd_framebuffer + (y/8) * LCD_WIDTH; + frameb = lcd_fb + (y/8) * LCD_WIDTH; srcx = 0; /* reset our x counter before each row... */ shift = (y & 7); mask = ~pixmask[y & 7]; -- cgit v1.2.3