From 9d96de49673cb6c916bfb797aad4f4e024ea73ca Mon Sep 17 00:00:00 2001
From: Fabien Sanglard <sanglardf@google.com>
Date: Tue, 11 Oct 2016 00:15:18 +0000
Subject: Revert "Delete HWC1"

This reverts commit 90f923493fa053655a203c34ea491086aeb07602.

Change-Id: If9da49e3bc85f8ff21ac1bd22a6bab97e9aa3103
---
 services/surfaceflinger/FenceTracker.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'services/surfaceflinger/FenceTracker.cpp')

diff --git a/services/surfaceflinger/FenceTracker.cpp b/services/surfaceflinger/FenceTracker.cpp
index a3aaf4271a..0e18a937e4 100644
--- a/services/surfaceflinger/FenceTracker.cpp
+++ b/services/surfaceflinger/FenceTracker.cpp
@@ -141,6 +141,7 @@ void FenceTracker::addFrame(nsecs_t refreshStartTime, sp<Fence> retireFence,
 
         layers[i]->getFenceData(&name, &frameNumber, &glesComposition,
                 &postedTime, &acquireFence, &prevReleaseFence);
+#ifdef USE_HWC2
         if (glesComposition) {
             frame.layers.emplace(std::piecewise_construct,
                     std::forward_as_tuple(layerId),
@@ -157,6 +158,16 @@ void FenceTracker::addFrame(nsecs_t refreshStartTime, sp<Fence> retireFence,
                 prevLayer->second.releaseFence = prevReleaseFence;
             }
         }
+#else
+        frame.layers.emplace(std::piecewise_construct,
+                std::forward_as_tuple(layerId),
+                std::forward_as_tuple(name, frameNumber, glesComposition,
+                postedTime, 0, 0, acquireFence,
+                glesComposition ? Fence::NO_FENCE : prevReleaseFence));
+        if (glesComposition) {
+            wasGlesCompositionDone = true;
+        }
+#endif
         frame.layers.emplace(std::piecewise_construct,
                 std::forward_as_tuple(layerId),
                 std::forward_as_tuple(name, frameNumber, glesComposition,
-- 
cgit v1.2.3-59-g8ed1b