commit 9d96de49673cb6c916bfb797aad4f4e024ea73ca
author Fabien Sanglard <sanglardf@google.com> Tue Oct 11 00:15:18 2016 +0000
committer Fabien Sanglard <sanglardf@google.com> Tue Oct 11 00:15:18 2016 +0000
tree 99fc88f0e10e7764cd1a5ddf03189c2379dfbbd3
parent 90f923493fa053655a203c34ea491086aeb07602

Revert "Delete HWC1"

This reverts commit 90f923493fa053655a203c34ea491086aeb07602.

Change-Id: If9da49e3bc85f8ff21ac1bd22a6bab97e9aa3103

services/surfaceflinger/SurfaceFlingerConsumer.h

diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.h b/services/surfaceflinger/SurfaceFlingerConsumer.h
index 0f9a0b4..4271039 100644
--- a/services/surfaceflinger/SurfaceFlingerConsumer.h
+++ b/services/surfaceflinger/SurfaceFlingerConsumer.h
@@ -81,7 +81,9 @@
 
     virtual void setReleaseFence(const sp<Fence>& fence) override;
     sp<Fence> getPrevReleaseFence() const;
+#ifdef USE_HWC2
     void releasePendingBuffer();
+#endif
 
     virtual bool getFrameTimestamps(uint64_t frameNumber,
             FrameTimestamps* outTimestamps) const override;
@@ -99,9 +101,11 @@
     // The portion of this surface that has changed since the previous frame
     Region mSurfaceDamage;
 
+#ifdef USE_HWC2
     // A release that is pending on the receipt of a new release fence from
     // presentDisplay
     PendingRelease mPendingRelease;
+#endif
 
     // The release fence of the already displayed buffer (previous frame).
     sp<Fence> mPrevReleaseFence;