SF: Support SolidColor layers in setUpHwComposer
Add code to program visibleRegion and color in setUpHwComposer
Test: Compile/Run manually
Merged-In: Ia7b5c28d51d81c28bfa48f3987300bf9ff20dfa4
Change-Id: Ia7b5c28d51d81c28bfa48f3987300bf9ff20dfa4
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 616d22e..19d2f21 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -794,27 +794,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 {