commit 6ce838da964150d7c9603fdcf806b7305400d24b
author Bo Hu <bohu@google.com> Tue Mar 27 17:31:10 2018 +0000
committer Bo Hu <bohu@google.com> Tue Mar 27 17:31:10 2018 +0000
tree 0d819f2e5184a2efae16a86489d31fc9144c40c3
parent 9968288e8776e6ee0b600efb5643d6e07855ce03

Revert "fix drawWithOpengl"

This reverts commit 9968288e8776e6ee0b600efb5643d6e07855ce03.

Reason for revert: it was suspected to causing regression
revert first

Change-Id: I9f0cfc477a46909574d95456bbbde024e60357e0
BUG: 76223302

services/surfaceflinger/BufferLayer.cpp

diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 579f7ec..916576a 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -793,27 +793,17 @@
     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;
+    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) {
-        engine.setSourceY410BT2020(true);
+        getBE().compositionInfo.re.Y410BT2020 = true;
     }
-
-    engine.drawMesh(getBE().mMesh);
-    engine.disableBlending();
-
-    engine.setSourceY410BT2020(false);
 }
 
 uint32_t BufferLayer::getProducerStickyTransform() const {