commit f1405186f4677f38135561931cd60334ef9dfda2
author Chia-I Wu <olv@google.com> Mon Nov 27 11:29:21 2017 -0800
committer Chia-I Wu <olv@google.com> Mon Dec 11 11:11:26 2017 -0800
tree 8847a24865b24fbccf32271c9184345904b66aaa
parent f49c189d6b20a1c72d0079b418b7050e0a9a1ef2

surfaceflinger: add BufferLayerConsumer

Copied from GLConsumer.{cpp,h}.  Run sed and clang-format on them.
Minor fixes (incorrect header path, already defined macros) to make
them compile.

Make SurfaceFlingerConsumer inherit from BufferLayerConsumer.

Test: boots
Change-Id: I44ef6b15e77fb84b60ab788457a8ed0a1c784a95

services/surfaceflinger/SurfaceFlingerConsumer.cpp

diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.cpp b/services/surfaceflinger/SurfaceFlingerConsumer.cpp
index d5ba09d..c29dad3 100644
--- a/services/surfaceflinger/SurfaceFlingerConsumer.cpp
+++ b/services/surfaceflinger/SurfaceFlingerConsumer.cpp
@@ -42,7 +42,7 @@
     Mutex::Autolock lock(mMutex);
 
     if (mAbandoned) {
-        ALOGE("updateTexImage: GLConsumer is abandoned!");
+        ALOGE("updateTexImage: BufferLayerConsumer is abandoned!");
         return NO_INIT;
     }
 
@@ -116,7 +116,7 @@
 
 status_t SurfaceFlingerConsumer::acquireBufferLocked(BufferItem* item,
         nsecs_t presentWhen, uint64_t maxFrameNumber) {
-    status_t result = GLConsumer::acquireBufferLocked(item, presentWhen,
+    status_t result = BufferLayerConsumer::acquireBufferLocked(item, presentWhen,
             maxFrameNumber);
     if (result == NO_ERROR) {
         mTransformToDisplayInverse = item->mTransformToDisplayInverse;
@@ -190,7 +190,7 @@
 void SurfaceFlingerConsumer::setReleaseFence(const sp<Fence>& fence)
 {
     if (!mPendingRelease.isPending) {
-        GLConsumer::setReleaseFence(fence);
+        BufferLayerConsumer::setReleaseFence(fence);
         return;
     }
     auto currentTexture = mPendingRelease.currentTexture;