Revert "Delete HWC1"
This reverts commit 90f923493fa053655a203c34ea491086aeb07602.
Change-Id: If9da49e3bc85f8ff21ac1bd22a6bab97e9aa3103
diff --git a/services/surfaceflinger/FenceTracker.cpp b/services/surfaceflinger/FenceTracker.cpp
index a3aaf42..0e18a93 100644
--- a/services/surfaceflinger/FenceTracker.cpp
+++ b/services/surfaceflinger/FenceTracker.cpp
@@ -141,6 +141,7 @@
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 @@
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,