am a6537357: gralloc-qsd8k: Call glFinish on composition complete.

Merge commit 'a653735759df4b8338475d79044c6494b238e681'

* commit 'a653735759df4b8338475d79044c6494b238e681':
  gralloc-qsd8k: Call glFinish on composition complete.
This commit is contained in:
Dima Zavin 2009-10-13 11:53:11 -07:00 committed by Android Git Automerger
commit 2e18b56e5b
2 changed files with 12 additions and 1 deletions

View File

@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SHARED_LIBRARIES := liblog libcutils libGLESv1_CM
LOCAL_SRC_FILES := \
allocator.cpp \

View File

@ -36,6 +36,8 @@
#include <linux/fb.h>
#include <linux/msm_mdp.h>
#include <GLES/gl.h>
#include "gralloc_priv.h"
#include "gr.h"
@ -148,6 +150,14 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer)
return 0;
}
static int fb_compositionComplete(struct framebuffer_device_t* dev)
{
// STOPSHIP: Properly implement composition complete callback
glFinish();
return 0;
}
/*****************************************************************************/
int mapFrameBufferLocked(struct private_module_t* module)
@ -358,6 +368,7 @@ int fb_device_open(hw_module_t const* module, const char* name,
dev->device.setSwapInterval = fb_setSwapInterval;
dev->device.post = fb_post;
dev->device.setUpdateRect = 0;
dev->device.compositionComplete = fb_compositionComplete;
private_module_t* m = (private_module_t*)module;
status = mapFrameBuffer(m);