commit 06d63de03cb2a551ca99608f5aa0c4f3e200b0fc
author Chia-I Wu <olv@google.com> Wed Jan 04 14:58:51 2017 +0800
committer Iliyan Malchev <malchev@google.com> Thu Feb 09 06:17:54 2017 +0000
tree e5a7b120a0e081fb07cd8dfa806d744844821b44
parent f757977dfe80151074ee548805c7b4ccc7299c59

surfaceflinger: cache HWC client targets and buffers

Remember HWC client targets and buffers, and make sure we send each
unique slot/handle pair only once.  This allows the composer to
clone/register/retain each buffer only once.

Test: builds and boots
Change-Id: Ib485189043a9c132031e82d4d7380ace3bf9453d

libs/gui/GLConsumer.cpp

diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index b11a3e5..9532c52 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -930,9 +930,14 @@
     return mCurrentFrameNumber;
 }
 
-sp<GraphicBuffer> GLConsumer::getCurrentBuffer() const {
+sp<GraphicBuffer> GLConsumer::getCurrentBuffer(int* outSlot) const {
     Mutex::Autolock lock(mMutex);
-    return (mCurrentTextureImage == NULL) ?
+
+    if (outSlot != nullptr) {
+        *outSlot = mCurrentTexture;
+    }
+
+    return (mCurrentTextureImage == nullptr) ?
             NULL : mCurrentTextureImage->graphicBuffer();
 }
 

libs/vr/libvrflinger/hardware_composer.cpp

diff --git a/libs/vr/libvrflinger/hardware_composer.cpp b/libs/vr/libvrflinger/hardware_composer.cpp
index d0e4493..5253b26 100644
--- a/libs/vr/libvrflinger/hardware_composer.cpp
+++ b/libs/vr/libvrflinger/hardware_composer.cpp
@@ -1501,7 +1501,8 @@
 
   if (composition_type_ == HWC2_COMPOSITION_DEVICE) {
     ret = (int32_t)hwc2_hidl_->setLayerBuffer(HWC_DISPLAY_PRIMARY,
-                                              hardware_composer_layer_, handle,
+                                              hardware_composer_layer_, 0,
+                                              handle,
                                               acquire_fence_fd_.Get());
 
     ALOGE_IF(ret, "HardwareComposer: Error setting layer buffer : %d", ret);