summaryrefslogtreecommitdiffstats
path: root/modules/hwcomposer
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-07-31 12:16:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-31 12:16:24 -0700
commit85ab59a147eb67cd17a9348949d5a365bf702a5f (patch)
tree67ca42916ff06f835d5f47fb19002ae2289e5f0c /modules/hwcomposer
parent65bed1f947ad9eb992c02a3563bd64ef05c4e268 (diff)
downloadhardware_libhardware-85ab59a147eb67cd17a9348949d5a365bf702a5f.zip
hardware_libhardware-85ab59a147eb67cd17a9348949d5a365bf702a5f.tar.gz
hardware_libhardware-85ab59a147eb67cd17a9348949d5a365bf702a5f.tar.bz2
Revert "Add multi-display and flip fence to HWC"
This reverts commit 1d51b2b9fc713da6de18117bc19508ecdfde4f23 Change-Id: I1ae46d8cae1cb3064800cd24df56347b05eb6059
Diffstat (limited to 'modules/hwcomposer')
-rw-r--r--modules/hwcomposer/hwcomposer.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/hwcomposer/hwcomposer.cpp b/modules/hwcomposer/hwcomposer.cpp
index f0a5512..0e49e4c 100644
--- a/modules/hwcomposer/hwcomposer.cpp
+++ b/modules/hwcomposer/hwcomposer.cpp
@@ -67,26 +67,26 @@ static void dump_layer(hwc_layer_1_t const* l) {
l->displayFrame.bottom);
}
-static int hwc_prepare(hwc_composer_device_1_t *dev,
- size_t numDisplays, hwc_display_contents_1_t** displays) {
- if (displays && (displays[0]->flags & HWC_GEOMETRY_CHANGED)) {
- for (size_t i=0 ; i<displays[0]->numHwLayers ; i++) {
+static int hwc_prepare(hwc_composer_device_1_t *dev, hwc_layer_list_1_t* list) {
+ if (list && (list->flags & HWC_GEOMETRY_CHANGED)) {
+ for (size_t i=0 ; i<list->numHwLayers ; i++) {
//dump_layer(&list->hwLayers[i]);
- displays[0]->hwLayers[i].compositionType = HWC_FRAMEBUFFER;
+ list->hwLayers[i].compositionType = HWC_FRAMEBUFFER;
}
}
return 0;
}
static int hwc_set(hwc_composer_device_1_t *dev,
- size_t numDisplays, hwc_display_contents_1_t** displays)
+ hwc_display_t dpy,
+ hwc_surface_t sur,
+ hwc_layer_list_1_t* list)
{
//for (size_t i=0 ; i<list->numHwLayers ; i++) {
// dump_layer(&list->hwLayers[i]);
//}
- EGLBoolean sucess = eglSwapBuffers((EGLDisplay)displays[0]->dpy,
- (EGLSurface)displays[0]->sur);
+ EGLBoolean sucess = eglSwapBuffers((EGLDisplay)dpy, (EGLSurface)sur);
if (!sucess) {
return HWC_EGL_ERROR;
}