Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f0167a5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "fix drawWithOpengl""

parents e97d9f94 6ce838da

services/surfaceflinger/BufferLayer.cpp

+7 −17
Original line number Diff line number Diff line
@@ -830,27 +830,17 @@ void BufferLayer::drawWithOpenGL(const RenderArea& renderArea, bool useIdentityT 
    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);

    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;



    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 {