diff options
| author | 2021-09-09 21:11:43 +0000 | |
|---|---|---|
| committer | 2021-09-09 21:11:43 +0000 | |
| commit | 8dbf247294c0894306573c3207882bc6321fd6ab (patch) | |
| tree | 31311059e7c27c3a21775815cb46ff45a1e1dd18 /cmds/bootanimation/BootAnimation.cpp | |
| parent | c3f1b93a7ff46a6b2135a0504bfc8b0531ad6633 (diff) | |
| parent | 580ae422b601b1a43e65a312112f317b30ae84d8 (diff) | |
Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev am: 3a986bb956 am: 580ae422b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779528
Change-Id: I84d1dfbbc337eeea95e53772d95ce2ee694155ee
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 7ed0bed43833..c074029ab553 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -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; |