summaryrefslogtreecommitdiff
path: root/apps/plugins/zxbox
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-10-07 02:01:35 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2020-10-26 12:28:48 -0400
commit3237ae4a4ff9296a377ff9194a11038da161208f (patch)
treeaf4338c78467b9b0845d76c39da1fbe10f25e23e /apps/plugins/zxbox
parent12f3ed1699d6bef25bed90ba95cbcc1a6bb4934a (diff)
downloadrockbox-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/zxbox')
-rw-r--r--apps/plugins/zxbox/zxvid_16bpp.c11
-rw-r--r--apps/plugins/zxbox/zxvid_2bpp.c13
2 files changed, 19 insertions, 5 deletions
diff --git a/apps/plugins/zxbox/zxvid_16bpp.c b/apps/plugins/zxbox/zxvid_16bpp.c
index f8482e3147..f0e2cee5ac 100644
--- a/apps/plugins/zxbox/zxvid_16bpp.c
+++ b/apps/plugins/zxbox/zxvid_16bpp.c
@@ -33,6 +33,8 @@ static const unsigned _16bpp_colors[32] = {
33 LCD_RGBPACK(IB1, IB1, IB0), LCD_RGBPACK(IB1, IB1, IB1), 33 LCD_RGBPACK(IB1, IB1, IB0), LCD_RGBPACK(IB1, IB1, IB1),
34}; 34};
35 35
36static fb_data *lcd_fb = NULL;
37
36void init_spect_scr(void) 38void init_spect_scr(void)
37{ 39{
38 int i; 40 int i;
@@ -49,6 +51,11 @@ void init_spect_scr(void)
49 51
50void update_screen(void) 52void update_screen(void)
51{ 53{
54 if (!lcd_fb)
55 {
56 struct viewport *vp_main = rb->lcd_set_viewport(NULL);
57 lcd_fb = vp_main->buffer->fb_ptr;
58 }
52 fb_data *frameb; 59 fb_data *frameb;
53 60
54 int y=0; 61 int y=0;
@@ -58,7 +65,7 @@ void update_screen(void)
58 byte *scrptr; 65 byte *scrptr;
59 scrptr = (byte *) SPNM(image); 66 scrptr = (byte *) SPNM(image);
60 */ 67 */
61 frameb = *rb->lcd_framebuffer; 68 frameb = lcd_fb;
62 for ( y = 0 ; y < HEIGHT*WIDTH; y++ ){ 69 for ( y = 0 ; y < HEIGHT*WIDTH; y++ ){
63 frameb[y] = FB_SCALARPACK(_16bpp_colors[(unsigned)sp_image[y]]); 70 frameb[y] = FB_SCALARPACK(_16bpp_colors[(unsigned)sp_image[y]]);
64 } 71 }
@@ -68,7 +75,7 @@ void update_screen(void)
68 int srcx, srcy=0; /* x / y coordinates in source image */ 75 int srcx, srcy=0; /* x / y coordinates in source image */
69 unsigned char* image; 76 unsigned char* image;
70 image = sp_image + ( (Y_OFF)*(WIDTH) ) + X_OFF; 77 image = sp_image + ( (Y_OFF)*(WIDTH) ) + X_OFF;
71 frameb = *rb->lcd_framebuffer; 78 frameb = lcd_fb;
72 for(y = 0; y < LCD_HEIGHT; y++) 79 for(y = 0; y < LCD_HEIGHT; y++)
73 { 80 {
74 srcx = 0; /* reset our x counter before each row... */ 81 srcx = 0; /* reset our x counter before each row... */
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] = {
26 0, 1, 1, 1, 2, 2, 3, 3 26 0, 1, 1, 1, 2, 2, 3, 3
27}; 27};
28 28
29static fb_data *lcd_fb = NULL;
30
29void init_spect_scr(void) 31void init_spect_scr(void)
30{ 32{
31 int i; 33 int i;
@@ -41,6 +43,11 @@ void init_spect_scr(void)
41} 43}
42void update_screen(void) 44void update_screen(void)
43{ 45{
46 if (!lcd_fb)
47 {
48 struct viewport *vp_main = rb->lcd_set_viewport(NULL);
49 lcd_fb = vp_main->buffer->fb_ptr;
50 }
44 fb_data *frameb; 51 fb_data *frameb;
45 int y=0; 52 int y=0;
46 int x=0; 53 int x=0;
@@ -51,7 +58,7 @@ void update_screen(void)
51#if LCD_PIXELFORMAT == HORIZONTAL_PACKING 58#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
52 for(y = 0; y < LCD_HEIGHT; y++) 59 for(y = 0; y < LCD_HEIGHT; y++)
53 { 60 {
54 frameb = *rb->lcd_framebuffer + (y) * FB_WIDTH; 61 frameb = lcd_fb + (y) * FB_WIDTH;
55 srcx = 0; /* reset our x counter before each row... */ 62 srcx = 0; /* reset our x counter before each row... */
56 for(x = 0; x < LCD_WIDTH; x++) 63 for(x = 0; x < LCD_WIDTH; x++)
57 { 64 {
@@ -67,7 +74,7 @@ void update_screen(void)
67 int shift; 74 int shift;
68 for(y = 0; y < LCD_HEIGHT; y++) 75 for(y = 0; y < LCD_HEIGHT; y++)
69 { 76 {
70 frameb = *rb->lcd_framebuffer + (y/4) * LCD_WIDTH; 77 frameb = lcd_fb + (y/4) * LCD_WIDTH;
71 srcx = 0; /* reset our x counter before each row... */ 78 srcx = 0; /* reset our x counter before each row... */
72 shift = ((y & 3 ) * 2 ); 79 shift = ((y & 3 ) * 2 );
73 mask = ~pixmask[y & 3]; 80 mask = ~pixmask[y & 3];
@@ -84,7 +91,7 @@ void update_screen(void)
84 int shift; 91 int shift;
85 for(y = 0; y < LCD_HEIGHT; y++) 92 for(y = 0; y < LCD_HEIGHT; y++)
86 { 93 {
87 frameb = *rb->lcd_framebuffer + (y/8) * LCD_WIDTH; 94 frameb = lcd_fb + (y/8) * LCD_WIDTH;
88 srcx = 0; /* reset our x counter before each row... */ 95 srcx = 0; /* reset our x counter before each row... */
89 shift = (y & 7); 96 shift = (y & 7);
90 mask = ~pixmask[y & 7]; 97 mask = ~pixmask[y & 7];