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 /firmware/target/hosted/android/lcd-android.c | |
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 'firmware/target/hosted/android/lcd-android.c')
-rw-r--r-- | firmware/target/hosted/android/lcd-android.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c index a161406cc0..12df52c95e 100644 --- a/firmware/target/hosted/android/lcd-android.c +++ b/firmware/target/hosted/android/lcd-android.c | |||
@@ -83,7 +83,7 @@ void lcd_update(void) | |||
83 | if (display_on) | 83 | if (display_on) |
84 | { | 84 | { |
85 | JNIEnv e = *env_ptr; | 85 | JNIEnv e = *env_ptr; |
86 | jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer, | 86 | jobject buffer = e->NewDirectByteBuffer(env_ptr, FBADDR(0,0), |
87 | (jlong) FRAMEBUFFER_SIZE); | 87 | (jlong) FRAMEBUFFER_SIZE); |
88 | 88 | ||
89 | e->CallVoidMethod(env_ptr, RockboxFramebuffer_instance, | 89 | e->CallVoidMethod(env_ptr, RockboxFramebuffer_instance, |
@@ -97,7 +97,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
97 | if (display_on) | 97 | if (display_on) |
98 | { | 98 | { |
99 | JNIEnv e = *env_ptr; | 99 | JNIEnv e = *env_ptr; |
100 | jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer, | 100 | jobject buffer = e->NewDirectByteBuffer(env_ptr, FBADDR(0,0), |
101 | (jlong) FRAMEBUFFER_SIZE); | 101 | (jlong) FRAMEBUFFER_SIZE); |
102 | jobject rect = e->NewObject(env_ptr, AndroidRect_class, AndroidRect_constructor, | 102 | jobject rect = e->NewObject(env_ptr, AndroidRect_class, AndroidRect_constructor, |
103 | x, y, x + width, y + height); | 103 | x, y, x + width, y + height); |