commit abc64f0d096f61f8150dc6f8398a829281fd4dd0
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 14 20:46:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 20:46:23 2017 +0000
tree b986d769c57c0e611176d126e962caf97aef62ff
parent 3b70dffaa2fee64161ec0445ff9a96a2cb64324e
parent 406acb8c012f74a881daafaf370b19dec7ecda46

Merge "surfaceflinger: skip buffer cache when BYPASS_IHWC"

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index d2b26c2..4a281d4 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -914,6 +914,10 @@
         const sp<GraphicBuffer>& buffer,
         uint32_t* outSlot, sp<GraphicBuffer>* outBuffer)
 {
+#ifdef BYPASS_IHWC
+    *outSlot = slot;
+    *outBuffer = buffer;
+#else
     if (slot == BufferQueue::INVALID_BUFFER_SLOT || slot < 0) {
         // default to slot 0
         slot = 0;
@@ -934,6 +938,7 @@
         // update cache
         mBuffers[slot] = buffer;
     }
+#endif
 }
 
 // ---------------------------------------------------------------------------