commit b90d091c75095399d38f96901357902b827c7647
author Naseer Ahmed <naseer@codeaurora.org> Tue Jul 31 13:09:51 2012 -0700
committer Iliyan Malchev <malchev@google.com> Tue Aug 14 14:18:19 2012 -0700
tree 89ea03638c032a2a9254d1a8ef8c76eef4ebbc93
parent 45a9960377b09b1f72fe0c7ed662f1e0110e2d68

display: Compile for mako, disable copybit route

Change-Id: I147b50dbedd9d52c715982f911be5c9ac0e267f1

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index e30e06b..db6597d 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -87,8 +87,6 @@
         ExtOnly::reset();
 
         getLayerStats(ctx, list);
-        // Mark all layers to COPYBIT initially
-        CopyBit::prepare(ctx, list);
         if(VideoOverlay::prepare(ctx, list)) {
             ctx->overlayInUse = true;
             //Nothing here
@@ -165,7 +163,6 @@
     if (LIKELY(list)) {
         VideoOverlay::draw(ctx, list);
         ExtOnly::draw(ctx, list);
-        CopyBit::draw(ctx, list, (EGLDisplay)dpy, (EGLSurface)sur);
         MDPComp::draw(ctx, list);
         EGLBoolean sucess = eglSwapBuffers((EGLDisplay)dpy, (EGLSurface)sur);
         UIMirrorOverlay::draw(ctx);

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
old mode 100755
new mode 100644
index 8107400..135d651
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -343,7 +343,7 @@
     }
 
     //Number of layers
-    if(list->numHwLayers < 1 || list->numHwLayers > sMaxLayers) {
+    if(list->numHwLayers < 1 || list->numHwLayers > (uint32_t)sMaxLayers) {
         ALOGD_IF(isDebug(), "%s: Unsupported number of layers",__FUNCTION__);
         return false;
     }

libhwcomposer/hwc_mdpcomp.h

diff --git a/libhwcomposer/hwc_mdpcomp.h b/libhwcomposer/hwc_mdpcomp.h
old mode 100755
new mode 100644

libqdutils/idle_invalidator.cpp

diff --git a/libqdutils/idle_invalidator.cpp b/libqdutils/idle_invalidator.cpp
old mode 100755
new mode 100644