From aed9f3c81b67ff72b92a9de18de4ff38af523e54 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 6 Mar 2013 01:23:05 -0800 Subject: Revert "SurfaceFlinger: Change to support framebuffer flip for 2D blitters" This reverts commit f442ef1dfc17ca56b88c68c318599942f94e1d68. --- services/surfaceflinger/DisplayHardware/HWComposer.cpp | 6 ------ services/surfaceflinger/SurfaceFlinger.cpp | 3 --- 2 files changed, 9 deletions(-) diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 3ed8d97..9b4f2ab 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -776,11 +776,6 @@ status_t HWComposer::prepare() { if (l.compositionType == HWC_FRAMEBUFFER) { disp.hasFbComp = true; } - // If the composition type is BLIT, we set this to - // trigger a FLIP - if(l.compositionType == HWC_BLIT) { - disp.hasFbComp = true; - } if (l.compositionType == HWC_OVERLAY) { disp.hasOvComp = true; } @@ -1242,7 +1237,6 @@ void HWComposer::dump(String8& result, char* buffer, size_t SIZE) const { "HWC", "BACKGROUND", "FB TARGET", - "FB_BLIT", "UNKNOWN"}; if (type >= NELEM(compositionTypeName)) type = NELEM(compositionTypeName) - 1; diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 00efd49..dc562f1 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1619,9 +1619,6 @@ void SurfaceFlinger::doComposeSurfaces(const sp& hw, const layer->draw(hw, clip); break; } - case HWC_BLIT: - //Do nothing - break; case HWC_FRAMEBUFFER_TARGET: { // this should not happen as the iterator shouldn't // let us get there. -- cgit v1.1