commit 5723fbda94dc6c8ecc444360dc2de487585daa78
author Wale Ogunwale <ogunwale@google.com> Thu Feb 28 15:53:59 2019 +0000
committer Wale Ogunwale <ogunwale@google.com> Thu Feb 28 15:53:59 2019 +0000
tree c7eca1074a0e7773a6a166e278d5e4c2c4ceb105
parent b28f007e51fb84ff78ce8b053d80efb0efdbce20

Revert "Caching between SF and HWC for BufferStateLayers"

This reverts commit b28f007e51fb84ff78ce8b053d80efb0efdbce20.

Reason for revert: Causing pre-submit failure b/126704033

Change-Id: I17c99cd410b3fa3825d01fedd21a52451368b5c0

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index a6c090c..f6b69eb 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -565,17 +565,14 @@
 void BufferStateLayer::setHwcLayerBuffer(const sp<const DisplayDevice>& display) {
     const auto outputLayer = findOutputLayerForDisplay(display);
     LOG_FATAL_IF(!outputLayer || !outputLayer->getState().hwc);
-    auto& hwcInfo = *outputLayer->editState().hwc;
-    auto& hwcLayer = hwcInfo.hwcLayer;
+    auto& hwcLayer = (*outputLayer->getState().hwc).hwcLayer;
 
     const State& s(getDrawingState());
 
-    // obtain slot
+    // TODO(marissaw): support more than one slot
     uint32_t hwcSlot = 0;
-    sp<GraphicBuffer> buffer;
-    hwcInfo.hwcBufferCache.getHwcBuffer(s.buffer, &hwcSlot, &buffer);
 
-    auto error = hwcLayer->setBuffer(hwcSlot, buffer, s.acquireFence);
+    auto error = hwcLayer->setBuffer(hwcSlot, s.buffer, s.acquireFence);
     if (error != HWC2::Error::None) {
         ALOGE("[%s] Failed to set buffer %p: %s (%d)", mName.string(),
               s.buffer->handle, to_string(error).c_str(), static_cast<int32_t>(error));