| author | Tao Dong <tao.dong@amlogic.com> | 2016-05-03 02:33:42 (GMT) |
|---|---|---|
| committer | Tao Dong <tao.dong@amlogic.com> | 2016-05-03 02:41:50 (GMT) |
| commit | 9131beff4ea27b22e8e9391ae5d80056c24bb9b6 (patch) | |
| tree | 448a5517030850985f1b9a99c0adf0732f005482 | |
| parent | df835268c0e743e32efbf72c16c87278d8a17515 (diff) | |
| download | gralloc-9131beff4ea27b22e8e9391ae5d80056c24bb9b6.zip gralloc-9131beff4ea27b22e8e9391ae5d80056c24bb9b6.tar.gz gralloc-9131beff4ea27b22e8e9391ae5d80056c24bb9b6.tar.bz2 | |
Revert "pd#123026 fix bug of osd2 bmp-color display"
This reverts commit d14a335461528b0d7ae0d6627e011b487cde671d.
Change-Id: I35cfb9b702fe44e54f91c1a6655fe8dafb83bd41
| -rw-r--r-- | framebuffer.cpp | 63 |
1 files changed, 2 insertions, 61 deletions
diff --git a/framebuffer.cpp b/framebuffer.cpp index b92e16d..c081343 100644 --- a/framebuffer.cpp +++ b/framebuffer.cpp @@ -119,36 +119,7 @@ int update_cursor_buffer_locked(struct framebuffer_info_t* cbinfo, int xres, int ALOGE("vinfo. %d %d", info.xres, info.yres); info.xoffset = info.yoffset = 0; - if (bits_per_pixel() == 16) - { - /* - * Explicitly request 5/6/5 - */ - info.bits_per_pixel = 16; - info.red.offset = 11; - info.red.length = 5; - info.green.offset = 5; - info.green.length = 6; - info.blue.offset = 0; - info.blue.length = 5; - info.transp.offset = 0; - info.transp.length = 0; - } - else - { - /* - * Explicitly request 8/8/8/8 - */ - info.bits_per_pixel = 32; - info.red.offset = 0; - info.red.length = 8; - info.green.offset = 8; - info.green.length = 8; - info.blue.offset = 16; - info.blue.length = 8; - info.transp.offset = 24; - info.transp.length = 8; - } + info.bits_per_pixel = 32; info.xres_virtual = info.xres = xres; info.yres_virtual = info.yres = yres; @@ -253,37 +224,7 @@ int init_cursor_buffer_locked(struct framebuffer_info_t* cbinfo) ALOGE("vinfo. %d %d", info.xres, info.yres); info.xoffset = info.yoffset = 0; - - if (bits_per_pixel() == 16) - { - /* - * Explicitly request 5/6/5 - */ - info.bits_per_pixel = 16; - info.red.offset = 11; - info.red.length = 5; - info.green.offset = 5; - info.green.length = 6; - info.blue.offset = 0; - info.blue.length = 5; - info.transp.offset = 0; - info.transp.length = 0; - } - else - { - /* - * Explicitly request 8/8/8/8 - */ - info.bits_per_pixel = 32; - info.red.offset = 0; - info.red.length = 8; - info.green.offset = 8; - info.green.length = 8; - info.blue.offset = 16; - info.blue.length = 8; - info.transp.offset = 24; - info.transp.length = 8; - } + info.bits_per_pixel = 32; if (ioctl(fd, FBIOPUT_VSCREENINFO, &info) == -1) { |