diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-09-18 23:46:37 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-09-18 23:46:37 +1000 |
| commit | b25ac5e667d98f2915831a74707f6ec198a4498b (patch) | |
| tree | 5cff480e6f12421ccb043de280be69b46f1fa56f /include/gfx_rules.h | |
| parent | 85aa1f03edd406f1499e4835e1591ad545e5354e (diff) | |
| download | uGFX-b25ac5e667d98f2915831a74707f6ec198a4498b.tar.gz uGFX-b25ac5e667d98f2915831a74707f6ec198a4498b.tar.bz2 uGFX-b25ac5e667d98f2915831a74707f6ec198a4498b.zip | |
Scrolling emulation when not supported by hardware
Start of new multiple display support
GDISP performance optimisations
Documentation updates
Win32 driver updates
Diffstat (limited to 'include/gfx_rules.h')
| -rw-r--r-- | include/gfx_rules.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/include/gfx_rules.h b/include/gfx_rules.h index afd2a8fe..a8dd031e 100644 --- a/include/gfx_rules.h +++ b/include/gfx_rules.h @@ -134,17 +134,13 @@ #endif #if GFX_USE_GDISP - #if GDISP_NEED_MULTITHREAD && GDISP_NEED_ASYNC - #error "GDISP: Only one of GDISP_NEED_MULTITHREAD and GDISP_NEED_ASYNC should be defined." - #endif - #if GDISP_NEED_ASYNC && !(GFX_USE_GQUEUE && GQUEUE_NEED_GSYNC) - #if GFX_DISPLAY_RULE_WARNINGS - #warning "GDISP: GDISP_NEED_ASYNC requires GFX_USE_GQUEUE and GQUEUE_NEED_GSYNC. They have been turned on for you." + #if GDISP_MULTIPLE_DRIVERS + #ifndef GDISP_PIXELFORMAT + #if GFX_DISPLAY_RULE_WARNINGS + #warning "GDISP: GDISP_MULTIPLE_DRIVERS requires GDISP_PIXELFORMAT to be set. It has been defaulted to GDISP_PIXELFORMAT_RGB565." + #endif + #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 #endif - #undef GFX_USE_GQUEUE - #define GFX_USE_GQUEUE TRUE - #undef GQUEUE_NEED_GSYNC - #define GQUEUE_NEED_GSYNC TRUE #endif #if GDISP_NEED_ANTIALIAS && !GDISP_NEED_PIXELREAD #if GDISP_HARDWARE_PIXELREAD @@ -161,11 +157,11 @@ #endif #if (defined(GDISP_INCLUDE_FONT_SMALL) && GDISP_INCLUDE_FONT_SMALL) || (defined(GDISP_INCLUDE_FONT_LARGER) && GDISP_INCLUDE_FONT_LARGER) #if GFX_DISPLAY_RULE_WARNINGS - #warning "GDISP: An old font (Small or Larger) has been defined. A single default font of DEJAVUSANS12 has been added instead." + #warning "GDISP: An old font (Small or Larger) has been defined. A single default font of UI2 has been added instead." #warning "GDISP: Please see <$(GFXLIB)/include/gdisp/fonts/fonts.h> for a list of available font names." #endif - #undef GDISP_INCLUDE_FONT_DEJAVUSANS12 - #define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE + #undef GDISP_INCLUDE_FONT_UI2 + #define GDISP_INCLUDE_FONT_UI2 TRUE #endif #endif |