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/lua | |
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/lua')
-rw-r--r-- | apps/plugins/lua/rocklib_img.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/plugins/lua/rocklib_img.c b/apps/plugins/lua/rocklib_img.c index da3ef4b52c..887ef984d0 100644 --- a/apps/plugins/lua/rocklib_img.c +++ b/apps/plugins/lua/rocklib_img.c | |||
@@ -1242,6 +1242,7 @@ static int get_screen(lua_State *L, int narg) | |||
1242 | return screen; | 1242 | return screen; |
1243 | } | 1243 | } |
1244 | #else /* only SCREEN_MAIN exists */ | 1244 | #else /* only SCREEN_MAIN exists */ |
1245 | #define get_screen(a,b) (SCREEN_MAIN) | ||
1245 | #define RB_SCREEN_STRUCT(luastate, narg) \ | 1246 | #define RB_SCREEN_STRUCT(luastate, narg) \ |
1246 | rb->screens[SCREEN_MAIN] | 1247 | rb->screens[SCREEN_MAIN] |
1247 | #define RB_SCREENS(luastate, narg, func, ...) \ | 1248 | #define RB_SCREENS(luastate, narg, func, ...) \ |
@@ -1379,7 +1380,12 @@ RB_WRAP(font_getstringsize) | |||
1379 | 1380 | ||
1380 | RB_WRAP(lcd_framebuffer) | 1381 | RB_WRAP(lcd_framebuffer) |
1381 | { | 1382 | { |
1382 | rli_wrap(L, *rb->lcd_framebuffer, LCD_WIDTH, LCD_HEIGHT); | 1383 | int screen = get_screen(L, 1); |
1384 | static struct viewport vp; | ||
1385 | rb->viewport_set_fullscreen(&vp, screen); | ||
1386 | rli_wrap(L, vp.buffer->data, | ||
1387 | RB_SCREEN_STRUCT(L, 1)->lcdwidth, | ||
1388 | RB_SCREEN_STRUCT(L, 1)->lcdheight); | ||
1383 | return 1; | 1389 | return 1; |
1384 | } | 1390 | } |
1385 | 1391 | ||