diff options
| author | 2010-06-30 15:59:02 -0700 | |
|---|---|---|
| committer | 2010-06-30 15:59:02 -0700 | |
| commit | 05dedd17ec753ce8a791679c59504a33ad667f3c (patch) | |
| tree | a7b61355359de16fef3115c29d03b4a6b4dc80c2 /libs/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 3813eebfa8733b183b5f3596565e14991397ab22 (diff) | |
| parent | a8f3e4e53cad835d0d57b85a6ce1b7416e95ba73 (diff) | |
Merge "fix live wallpapers on Droid" into gingerbread
Diffstat (limited to 'libs/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index 23efd161fa..68e8f19e7e 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -1263,10 +1263,19 @@ sp<Layer> SurfaceFlinger::createNormalSurface( format = PIXEL_FORMAT_RGBA_8888; break; case PIXEL_FORMAT_OPAQUE: +#ifdef NO_RGBX_8888 + format = PIXEL_FORMAT_RGB_565; +#else format = PIXEL_FORMAT_RGBX_8888; +#endif break; } +#ifdef NO_RGBX_8888 + if (format == PIXEL_FORMAT_RGBX_8888) + format = PIXEL_FORMAT_RGBA_8888; +#endif + sp<Layer> layer = new Layer(this, display, client); status_t err = layer->setBuffers(w, h, format, flags); if (LIKELY(err != NO_ERROR)) { |