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

Commit 6ab8a005 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[RenderEngine] correct alpha blending func" am: 6f942603 am:... 

Merge "[RenderEngine] correct alpha blending func" am: 6f942603 am: 9592c9d5 am: d0567ad4 am: 444c9835 am: 228b500f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1391116

Change-Id: I9ffe6ac0031d520f455e2f93260f78cd4e6a5a69
parents 0748d48f 228b500f

libs/renderengine/gl/GLESRenderEngine.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -1276,7 +1276,8 @@ void GLESRenderEngine::setupLayerBlending(bool premultipliedAlpha, bool opaque, 




    if (color.a < 1.0f || !opaque || cornerRadius > 0.0f) {

    if (color.a < 1.0f || !opaque || cornerRadius > 0.0f) {

        glEnable(GL_BLEND);

        glEnable(GL_BLEND);

        glBlendFunc(premultipliedAlpha ? GL_ONE : GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

        glBlendFuncSeparate(premultipliedAlpha ? GL_ONE : GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,

                            GL_ONE, GL_ONE_MINUS_SRC_ALPHA);

    } else {

    } else {

        glDisable(GL_BLEND);

        glDisable(GL_BLEND);

    }

    }

libs/renderengine/tests/RenderEngineTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -919,7 +919,7 @@ void RenderEngineTest::fillRedBufferWithoutPremultiplyAlpha() { 




void RenderEngineTest::fillBufferWithoutPremultiplyAlpha() {

void RenderEngineTest::fillBufferWithoutPremultiplyAlpha() {

    fillRedBufferWithoutPremultiplyAlpha();

    fillRedBufferWithoutPremultiplyAlpha();

    expectBufferColor(fullscreenRect(), 128, 0, 0, 64, 1);

    expectBufferColor(fullscreenRect(), 128, 0, 0, 128, 1);

}

}





void RenderEngineTest::clearLeftRegion() {

void RenderEngineTest::clearLeftRegion() {