diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-04 15:16:50 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-06 00:34:54 +0100 |
| commit | c962bf8b8fa4d9a6400811296fb270f47db68cf4 (patch) | |
| tree | f5e651935cbbf54e6d1488bbe19a6e2a4599a070 /libgralloc/framebuffer.cpp | |
| parent | 7a8a513ac8a2b9a76b36cf1341d45b00d88ed45c (diff) | |
| parent | 6445344dbaf08ec4d8fbf6aeeffdf29faed64e78 (diff) | |
| download | hardware_qcom_display-cm-10.1.tar.gz hardware_qcom_display-cm-10.1.tar.bz2 hardware_qcom_display-cm-10.1.zip | |
Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1
Change-Id: I44a10eaa285d0521669781a4fafb7641df209186
Diffstat (limited to 'libgralloc/framebuffer.cpp')
| -rw-r--r-- | libgralloc/framebuffer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp index 8e400224a..948cf1961 100644 --- a/libgralloc/framebuffer.cpp +++ b/libgralloc/framebuffer.cpp @@ -36,7 +36,7 @@ #include <GLES/gl.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include "fb_priv.h" #include "gr.h" #include <genlock.h> @@ -108,10 +108,11 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer) private_module_t* m = reinterpret_cast<private_module_t*>(dev->common.module); - if (hnd && hnd->flags & private_handle_t::PRIV_FLAGS_FRAMEBUFFER) { + if (hnd) { m->info.activate = FB_ACTIVATE_VBL | FB_ACTIVATE_FORCE; m->info.yoffset = hnd->offset / m->finfo.line_length; m->commit.var = m->info; + m->commit.flags |= MDP_DISPLAY_COMMIT_OVERLAY; if (ioctl(m->framebuffer->fd, MSMFB_DISPLAY_COMMIT, &m->commit) == -1) { ALOGE("%s: MSMFB_DISPLAY_COMMIT ioctl failed, err: %s", __FUNCTION__, strerror(errno)); @@ -124,6 +125,7 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer) static int fb_compositionComplete(struct framebuffer_device_t* dev) { // TODO: Properly implement composition complete callback + glFinish(); return 0; } |