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

Commit a5bbe35d authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am e83221c5: Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476 

* commit 'e83221c5':
  Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
parents 882aa5a7 e83221c5

libs/hwui/OpenGLRenderer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1398,8 +1398,8 @@ void OpenGLRenderer::setupDrawBlending(bool blend, SkXfermode::Mode mode, bool s 
    // When the blending mode is kClear_Mode, we need to use a modulate color

    // argb=1,0,0,0

    accountForClear(mode);

    chooseBlending(blend || (mColorSet && mColorA < 1.0f) || (mShader && mShader->blend()), mode,

            mDescription, swapSrcDst);

    chooseBlending(blend || (mColorSet && mColorA < 1.0f) || (mShader && mShader->blend()) ||

            (mColorFilter && mColorFilter->blend()), mode, mDescription, swapSrcDst);

}



void OpenGLRenderer::setupDrawProgram() {

libs/hwui/ProgramCache.cpp

+0 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ const char* gFS_Main_ApplyColorOp[4] = { 
        // None

        "",

        // Matrix

        // TODO: Fix premultiplied alpha computations for color matrix

        "    fragColor *= colorMatrix;\n"

        "    fragColor += colorMatrixVector;\n"

        "    fragColor.rgb *= fragColor.a;\n",

libs/hwui/SkiaColorFilter.cpp

+11 −8
Original line number Diff line number Diff line
@@ -36,11 +36,8 @@ SkiaColorFilter::~SkiaColorFilter() { 


SkiaColorMatrixFilter::SkiaColorMatrixFilter(SkColorFilter* skFilter, float* matrix, float* vector):

        SkiaColorFilter(skFilter, kColorMatrix, true), mMatrix(matrix), mVector(vector) {

    // Skia uses the range [0..255] for the addition vector, but we need

    // the [0..1] range to apply the vector in GLSL

    for (int i = 0; i < 4; i++) {

        mVector[i] /= 255.0f;

    }

    // TODO: We should be smarter about this

    mBlend = true;

}



SkiaColorMatrixFilter::~SkiaColorMatrixFilter() {
@@ -71,6 +68,9 @@ SkiaLightingFilter::SkiaLightingFilter(SkColorFilter *skFilter, int multiply, in 
    mAddR = ((add >> 16) & 0xFF) / 255.0f;

    mAddG = ((add >>  8) & 0xFF) / 255.0f;

    mAddB = ((add      ) & 0xFF) / 255.0f;



    // A lighting filter always ignores alpha

    mBlend = false;

}



void SkiaLightingFilter::describe(ProgramDescription& description, const Extensions& extensions) {
@@ -93,6 +93,9 @@ SkiaBlendFilter::SkiaBlendFilter(SkColorFilter *skFilter, int color, SkXfermode: 
    mR = mA * ((color >> 16) & 0xFF) / 255.0f;

    mG = mA * ((color >>  8) & 0xFF) / 255.0f;

    mB = mA * ((color      ) & 0xFF) / 255.0f;



    // TODO: We should do something smarter here

    mBlend = true;

}



void SkiaBlendFilter::describe(ProgramDescription& description, const Extensions& extensions) {