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

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

Merge "fix drawWithOpengl"

parents ca4aaf4b 9968288e
Loading
Loading
Loading
Loading
+17 −7
Original line number Diff line number Diff line
@@ -793,17 +793,27 @@ 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;
    //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 {