commit 2156613b58e6a792e3ab504ed0b7a0b189ff041b
author bohu <bohu@google.com> Tue Mar 27 14:36:34 2018 -0700
committer Bo Hu <bohu@google.com> Tue Mar 27 22:44:58 2018 +0000
tree a8483adc1bbecb85d4b64e7341315591d4090e66
parent 1bb1328a6f53de3417157ded07b479e484eb63ec

Revert "SF: Add support for screen captures"

This reverts commit dc5e0627b6217fee77af48e558dc2490941c4417.

Test: lunch sdk_phone_x86-userdebug
make -j
emulator
it should boot to homescreen
BUG: 76125889

services/surfaceflinger/BufferLayer.cpp

diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index a6caf29..f02c5fa 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -160,8 +160,6 @@
                          bool useIdentityTransform) const {
     ATRACE_CALL();
 
-    CompositionInfo& compositionInfo = getBE().compositionInfo;
-
     if (CC_UNLIKELY(mActiveBuffer == 0)) {
         // the texture has not been created yet, this Layer has
         // in fact never been drawn into. This happens frequently with
@@ -243,7 +241,6 @@
         mTexture.setDimensions(mActiveBuffer->getWidth(), mActiveBuffer->getHeight());
         mTexture.setFiltering(useFiltering);
         mTexture.setMatrix(textureMatrix);
-        compositionInfo.re.texture = mTexture;
 
         engine.setupLayerTexturing(mTexture);
     } else {
@@ -253,23 +250,6 @@
     engine.disableTexturing();
 }
 
-void BufferLayer::drawNow(const RenderArea& renderArea, bool useIdentityTransform) const {
-    CompositionInfo& compositionInfo = getBE().compositionInfo;
-    auto& engine(mFlinger->getRenderEngine());
-
-    draw(renderArea, useIdentityTransform);
-
-    engine.setupLayerTexturing(compositionInfo.re.texture);
-    engine.setupLayerBlending(compositionInfo.re.preMultipliedAlpha, compositionInfo.re.opaque,
-            false, compositionInfo.re.color);
-    engine.setSourceDataSpace(compositionInfo.hwc.dataspace);
-    engine.setSourceY410BT2020(compositionInfo.re.Y410BT2020);
-    engine.drawMesh(getBE().getMesh());
-    engine.disableBlending();
-    engine.disableTexturing();
-    engine.setSourceY410BT2020(false);
-}
-
 void BufferLayer::onLayerDisplayed(const sp<Fence>& releaseFence) {
     mConsumer->setReleaseFence(releaseFence);
 }
@@ -830,17 +810,21 @@
     texCoords[2] = vec2(right, 1.0f - bottom);
     texCoords[3] = vec2(right, 1.0f - top);
 
-    getBE().compositionInfo.re.preMultipliedAlpha = mPremultipliedAlpha;
-    getBE().compositionInfo.re.opaque = isOpaque(s);
-    getBE().compositionInfo.re.disableTexture = false;
-    getBE().compositionInfo.re.color = getColor();
-    getBE().compositionInfo.hwc.dataspace = mCurrentState.dataSpace;
+    auto& engine(mFlinger->getRenderEngine());
+    engine.setupLayerBlending(mPremultipliedAlpha, isOpaque(s), false /* disableTexture */,
+                              getColor());
+    engine.setSourceDataSpace(mCurrentState.dataSpace);
 
     if (mCurrentState.dataSpace == HAL_DATASPACE_BT2020_ITU_PQ &&
         mConsumer->getCurrentApi() == NATIVE_WINDOW_API_MEDIA &&
         getBE().compositionInfo.mBuffer->getPixelFormat() == HAL_PIXEL_FORMAT_RGBA_1010102) {
-        getBE().compositionInfo.re.Y410BT2020 = true;
+        engine.setSourceY410BT2020(true);
     }
+
+    engine.drawMesh(getBE().mMesh);
+    engine.disableBlending();
+
+    engine.setSourceY410BT2020(false);
 }
 
 uint32_t BufferLayer::getProducerStickyTransform() const {