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

Commit 8dbf2472 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev... 

Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev am: 3a986bb9 am: 580ae422

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779528

Change-Id: I84d1dfbbc337eeea95e53772d95ce2ee694155ee
parents c3f1b93a 580ae422

cmds/bootanimation/BootAnimation.cpp

+7 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static const char VERTEX_SHADER_SOURCE[] = R"( 
    })";

static const char IMAGE_FRAG_DYNAMIC_COLORING_SHADER_SOURCE[] = R"(

    precision mediump float;

    const float cWhiteMaskThreshold = 0.05f;

    const float cWhiteMaskThreshold = 0.05;

    uniform sampler2D uTexture;

    uniform float uFade;

    uniform float uColorProgress;
@@ -155,7 +155,7 @@ static const char IMAGE_FRAG_DYNAMIC_COLORING_SHADER_SOURCE[] = R"( 
                + g * mix(uStartColor1, uEndColor1, uColorProgress)

                + b * mix(uStartColor2, uEndColor2, uColorProgress)

                + a * mix(uStartColor3, uEndColor3, uColorProgress);

        color = mix(color, vec4(vec3((r + g + b + a) * 0.25f), 1.0), useWhiteMask);

        color = mix(color, vec4(vec3((r + g + b + a) * 0.25), 1.0), useWhiteMask);

        gl_FragColor = vec4(color.x, color.y, color.z, (1.0 - uFade)) * color.a;

    })";

static const char IMAGE_FRAG_SHADER_SOURCE[] = R"(
@@ -699,6 +699,11 @@ GLuint compileShader(GLenum shaderType, const GLchar *source) { 
    glGetShaderiv(shader, GL_COMPILE_STATUS, &isCompiled);

    if (isCompiled == GL_FALSE) {

        SLOGE("Compile shader failed. Shader type: %d", shaderType);

        GLint maxLength = 0;

        glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &maxLength);

        std::vector<GLchar> errorLog(maxLength);

        glGetShaderInfoLog(shader, maxLength, &maxLength, &errorLog[0]);

        SLOGE("Shader compilation error: %s", &errorLog[0]);

        return 0;

    }

    return shader;