summaryrefslogtreecommitdiff
path: root/apps/plugins/puzzles
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/puzzles
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/puzzles')
-rw-r--r--apps/plugins/puzzles/rockbox.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index ed58bd900a..08581db1c6 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -310,6 +310,7 @@ static int help_times = 0;
310#endif 310#endif
311 311
312/* clipping stuff */ 312/* clipping stuff */
313static fb_data *lcd_fb;
313static struct viewport clip_rect; 314static struct viewport clip_rect;
314static bool clipped = false, zoom_enabled = false, view_mode = true, mouse_mode = false; 315static bool clipped = false, zoom_enabled = false, view_mode = true, mouse_mode = false;
315 316
@@ -1016,7 +1017,7 @@ static void rb_draw_line(void *handle, int x1, int y1, int x2, int y2,
1016 } 1017 }
1017 else 1018 else
1018#endif 1019#endif
1019 draw_antialiased_line(*rb->lcd_framebuffer, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2); 1020 draw_antialiased_line(lcd_fb, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2);
1020 } 1021 }
1021 else 1022 else
1022 { 1023 {
@@ -1294,7 +1295,7 @@ static void rb_draw_poly(void *handle, int *coords, int npoints,
1294 x2, y2); 1295 x2, y2);
1295 } 1296 }
1296 else 1297 else
1297 draw_antialiased_line(*rb->lcd_framebuffer, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2); 1298 draw_antialiased_line(lcd_fb, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2);
1298 1299
1299#ifdef DEBUG_MENU 1300#ifdef DEBUG_MENU
1300 if(debug_settings.polyanim) 1301 if(debug_settings.polyanim)
@@ -1319,7 +1320,7 @@ static void rb_draw_poly(void *handle, int *coords, int npoints,
1319 x2, y2); 1320 x2, y2);
1320 } 1321 }
1321 else 1322 else
1322 draw_antialiased_line(*rb->lcd_framebuffer, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2); 1323 draw_antialiased_line(lcd_fb, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2);
1323 } 1324 }
1324 else 1325 else
1325 { 1326 {
@@ -1474,7 +1475,7 @@ static void rb_blitter_save(void *handle, blitter *bl, int x, int y)
1474 1475
1475 trim_rect(&x, &y, &w, &h); 1476 trim_rect(&x, &y, &w, &h);
1476 1477
1477 fb_data *fb = zoom_enabled ? zoom_fb : *rb->lcd_framebuffer; 1478 fb_data *fb = zoom_enabled ? zoom_fb : lcd_fb;
1478 LOGF("rb_blitter_save(%d, %d, %d, %d)", x, y, w, h); 1479 LOGF("rb_blitter_save(%d, %d, %d, %d)", x, y, w, h);
1479 for(int i = 0; i < h; ++i) 1480 for(int i = 0; i < h; ++i)
1480 { 1481 {
@@ -1778,9 +1779,9 @@ static void timer_cb(void)
1778 static bool what = false; 1779 static bool what = false;
1779 what = !what; 1780 what = !what;
1780 if(what) 1781 if(what)
1781 *rb->lcd_framebuffer[0] = LCD_BLACK; 1782 lcd_fb[0] = LCD_BLACK;
1782 else 1783 else
1783 *rb->lcd_framebuffer[0] = LCD_WHITE; 1784 lcd_fb[0] = LCD_WHITE;
1784 rb->lcd_update(); 1785 rb->lcd_update();
1785 } 1786 }
1786#endif 1787#endif
@@ -2909,7 +2910,7 @@ static void bench_aa(void)
2909 int i = 0; 2910 int i = 0;
2910 while(*rb->current_tick < next) 2911 while(*rb->current_tick < next)
2911 { 2912 {
2912 draw_antialiased_line(*rb->lcd_framebuffer, LCD_WIDTH, LCD_HEIGHT, 0, 0, 20, 31); 2913 draw_antialiased_line(lcd_fb, LCD_WIDTH, LCD_HEIGHT, 0, 0, 20, 31);
2913 ++i; 2914 ++i;
2914 } 2915 }
2915 rb->splashf(HZ, "%d AA lines/sec", i); 2916 rb->splashf(HZ, "%d AA lines/sec", i);
@@ -3843,6 +3844,8 @@ enum plugin_status plugin_start(const void *param)
3843 3844
3844 giant_buffer = rb->plugin_get_buffer(&giant_buffer_len); 3845 giant_buffer = rb->plugin_get_buffer(&giant_buffer_len);
3845 init_tlsf(); 3846 init_tlsf();
3847 struct viewport *vp_main = rb->lcd_set_viewport(NULL);
3848 lcd_fb = vp_main->buffer->fb_ptr;
3846 3849
3847 if(!strcmp(thegame.name, "Solo")) 3850 if(!strcmp(thegame.name, "Solo"))
3848 { 3851 {