diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
commit | 25123570c76f2055d3ae05d79741038c0e23c536 (patch) | |
tree | a2edd8351a611b9cef0aef08c880a994d9e1d75e /firmware/export | |
parent | f6025186fd1f6d9083c07568bc3d160f3e8774f8 (diff) | |
download | rockbox-25123570c76f2055d3ae05d79741038c0e23c536.tar.gz rockbox-25123570c76f2055d3ae05d79741038c0e23c536.zip |
Fix STRIDE macro for multiscreen and add stride support for picture lib.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22615 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/lcd.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 3d391d6685..3f3d8f875f 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -306,13 +306,25 @@ static inline unsigned lcd_color_to_native(unsigned color) | |||
306 | 306 | ||
307 | #endif /* HAVE_LCD_COLOR */ | 307 | #endif /* HAVE_LCD_COLOR */ |
308 | 308 | ||
309 | enum screen_type { | ||
310 | SCREEN_MAIN | ||
311 | #ifdef HAVE_REMOTE_LCD | ||
312 | ,SCREEN_REMOTE | ||
313 | #endif | ||
314 | }; | ||
315 | |||
309 | /* Frame buffer stride */ | 316 | /* Frame buffer stride */ |
317 | #define STRIDE_REMOTE(w, h) (w) | ||
318 | |||
310 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 319 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE |
311 | #define STRIDE(w, h) (h) | 320 | #define STRIDE_MAIN(w, h) (h) |
312 | #else | 321 | #else |
313 | #define STRIDE(w, h) (w) | 322 | #define STRIDE_MAIN(w, h) (w) |
314 | #endif | 323 | #endif |
315 | 324 | ||
325 | #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ | ||
326 | (h)):STRIDE_REMOTE((w),(h))) | ||
327 | |||
316 | /* Frame buffer dimensions */ | 328 | /* Frame buffer dimensions */ |
317 | #if LCD_DEPTH == 1 | 329 | #if LCD_DEPTH == 1 |
318 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING | 330 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING |