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

Commit b36ba1d6 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "OpenGLRenderer would not render colors < ALPHA_THRESHOLD Bug #3282805"

parents 300ed2cd 5536841e

libs/hwui/OpenGLRenderer.cpp

+8 −2
Original line number Diff line number Diff line
@@ -925,11 +925,17 @@ void OpenGLRenderer::setupDrawModelView(float left, float top, float right, floa 
}



void OpenGLRenderer::setupDrawColorUniforms() {

    if (mColorSet && mSetShaderColor) {

    if (mColorSet || (mShader && mSetShaderColor)) {

        mCaches.currentProgram->setColor(mColorR, mColorG, mColorB, mColorA);

    }

}



void OpenGLRenderer::setupDrawColorAlphaUniforms() {

    if (mSetShaderColor) {

        mCaches.currentProgram->setColor(mColorA, mColorA, mColorA, mColorA);

    }

}



void OpenGLRenderer::setupDrawShaderUniforms(bool ignoreTransform) {

    if (mShader) {

        if (ignoreTransform) {
@@ -1721,7 +1727,7 @@ void OpenGLRenderer::drawTextureMesh(float left, float top, float right, float b 
    } else {

        setupDrawModelViewTranslate(left, top, right, bottom, ignoreTransform);

    }

    setupDrawColorUniforms();

    setupDrawColorAlphaUniforms();

    setupDrawColorFilterUniforms();

    setupDrawTexture(texture);

    setupDrawMesh(vertices, texCoords, vbo);

libs/hwui/OpenGLRenderer.h

+1 −0
Original line number Diff line number Diff line
@@ -443,6 +443,7 @@ private: 
    void setupDrawModelViewTranslate(float left, float top, float right, float bottom,

            bool ignoreTransform = false);

    void setupDrawColorUniforms();

    void setupDrawColorAlphaUniforms();

    void setupDrawShaderUniforms(bool ignoreTransform = false);

    void setupDrawColorFilterUniforms();

    void setupDrawSimpleMesh();