From 85ab59a147eb67cd17a9348949d5a365bf702a5f Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Tue, 31 Jul 2012 12:16:24 -0700 Subject: Revert "Add multi-display and flip fence to HWC" This reverts commit 1d51b2b9fc713da6de18117bc19508ecdfde4f23 Change-Id: I1ae46d8cae1cb3064800cd24df56347b05eb6059 --- modules/hwcomposer/hwcomposer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'modules/hwcomposer') 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 ; inumHwLayers ; 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 ; inumHwLayers ; 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 ; inumHwLayers ; 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; } -- cgit v1.1