diff options
| author | Jesse Hall <jessehall@google.com> | 2014-03-11 18:36:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:36:24 +0000 |
| commit | f8e6a30ab98c544c1a5695455187ea7743dd1f40 (patch) | |
| tree | d0682aaf913caa34c4e8d9291eb5d9781c05207f | |
| parent | 0444d6942db0c05881bde81a255ea0469006cd85 (diff) | |
| parent | 282ab1b6b1a92b8cb2650c111bfab02916f8715d (diff) | |
| download | hardware_libhardware-f8e6a30ab98c544c1a5695455187ea7743dd1f40.zip hardware_libhardware-f8e6a30ab98c544c1a5695455187ea7743dd1f40.tar.gz hardware_libhardware-f8e6a30ab98c544c1a5695455187ea7743dd1f40.tar.bz2 | |
am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"
* commit '282ab1b6b1a92b8cb2650c111bfab02916f8715d':
gralloc: dont hardcode 32bpp as RGBX
| -rw-r--r-- | modules/gralloc/framebuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp index 326f2ae..9d8513a 100644 --- a/modules/gralloc/framebuffer.cpp +++ b/modules/gralloc/framebuffer.cpp @@ -330,7 +330,7 @@ int fb_device_open(hw_module_t const* module, const char* name, if (status >= 0) { int stride = m->finfo.line_length / (m->info.bits_per_pixel >> 3); int format = (m->info.bits_per_pixel == 32) - ? HAL_PIXEL_FORMAT_RGBX_8888 + ? (m->info.red.offset ? HAL_PIXEL_FORMAT_BGRA_8888 : HAL_PIXEL_FORMAT_RGBX_8888) : HAL_PIXEL_FORMAT_RGB_565; const_cast<uint32_t&>(dev->device.flags) = 0; const_cast<uint32_t&>(dev->device.width) = m->info.xres; |