summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/BufferQueueLayer.cpp
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2019-02-28 16:03:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-28 16:03:49 +0000
commitb82cf27c58512eca1aeb4b686ec9368d2cfc2af6 (patch)
treee9c4998a3b41150a0c92601bd5b4a5397999cf3c /services/surfaceflinger/BufferQueueLayer.cpp
parent84b50b862c6481ad25574affe00ad18d00cb87eb (diff)
parent5723fbda94dc6c8ecc444360dc2de487585daa78 (diff)
downloadandroid_frameworks_native-b82cf27c58512eca1aeb4b686ec9368d2cfc2af6.tar.gz
android_frameworks_native-b82cf27c58512eca1aeb4b686ec9368d2cfc2af6.tar.bz2
android_frameworks_native-b82cf27c58512eca1aeb4b686ec9368d2cfc2af6.zip
Merge "Revert "Caching between SF and HWC for BufferStateLayers""
Diffstat (limited to 'services/surfaceflinger/BufferQueueLayer.cpp')
-rw-r--r--services/surfaceflinger/BufferQueueLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index 18b0d58b3..215dea1ee 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -366,7 +366,7 @@ void BufferQueueLayer::setHwcLayerBuffer(const sp<const DisplayDevice>& display)
uint32_t hwcSlot = 0;
sp<GraphicBuffer> hwcBuffer;
(*outputLayer->editState().hwc)
- .hwcBufferCache.getHwcBuffer(mActiveBuffer, &hwcSlot, &hwcBuffer);
+ .hwcBufferCache.getHwcBuffer(mActiveBufferSlot, mActiveBuffer, &hwcSlot, &hwcBuffer);
auto acquireFence = mConsumer->getCurrentFence();
auto error = hwcLayer->setBuffer(hwcSlot, hwcBuffer, acquireFence);