2022-04-06 00:14:39 -04:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Tad <tad@spotco.us>
|
|
|
|
Date: Wed, 6 Apr 2022 01:10:00 -0400
|
|
|
|
Subject: [PATCH] Use basic boot animation
|
|
|
|
|
|
|
|
Signed-off-by: Tad <tad@spotco.us>
|
|
|
|
Change-Id: I0c87ddd9aec21fc610f3d17701192c04150308d7
|
|
|
|
---
|
|
|
|
cmds/bootanimation/BootAnimation.cpp | 10 ++--------
|
|
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
|
2022-07-12 08:37:21 -04:00
|
|
|
index f7cd1c6d78eb..429c852b4ee7 100644
|
2022-04-06 00:14:39 -04:00
|
|
|
--- a/cmds/bootanimation/BootAnimation.cpp
|
|
|
|
+++ b/cmds/bootanimation/BootAnimation.cpp
|
2022-07-12 08:37:21 -04:00
|
|
|
@@ -742,7 +742,7 @@ GLuint linkShader(GLuint vertexShader, GLuint fragmentShader) {
|
2022-04-06 00:14:39 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void BootAnimation::initShaders() {
|
|
|
|
- bool dynamicColoringEnabled = mAnimation != nullptr && mAnimation->dynamicColoringEnabled;
|
|
|
|
+ bool dynamicColoringEnabled = false;
|
|
|
|
GLuint vertexShader = compileShader(GL_VERTEX_SHADER, (const GLchar *)VERTEX_SHADER_SOURCE);
|
|
|
|
GLuint imageFragmentShader =
|
|
|
|
compileShader(GL_FRAGMENT_SHADER, dynamicColoringEnabled
|
2022-07-12 08:37:21 -04:00
|
|
|
@@ -778,13 +778,7 @@ bool BootAnimation::threadLoop() {
|
2022-04-06 00:14:39 -04:00
|
|
|
bool result;
|
|
|
|
initShaders();
|
|
|
|
|
|
|
|
- // We have no bootanimation file, so we use the stock android logo
|
|
|
|
- // animation.
|
|
|
|
- if (mZipFileName.isEmpty()) {
|
|
|
|
- result = android();
|
|
|
|
- } else {
|
|
|
|
- result = movie();
|
|
|
|
- }
|
|
|
|
+ result = android();
|
|
|
|
|
|
|
|
mCallbacks->shutdown();
|
|
|
|
eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
|