commit 228b500fe669038e9fd76dc267c15b2e15d342ff
author Treehugger Robot <treehugger-gerrit@google.com> Sat Aug 29 02:50:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Aug 29 02:50:35 2020 +0000
tree f13d264a079a8a13b02927dc7e8512571f270b85
parent 7043031c9bdecacd546e14997db9f4b3082f5ac4
parent 444c983529a6e567285e662493fc49d3f2952a04

Merge "[RenderEngine] correct alpha blending func" am: 6f94260396 am: 9592c9d586 am: d0567ad4a1 am: 444c983529

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1391116

Change-Id: I59f1be5a6465fc64012c45e7dd1dec7eea8e647e

libs/renderengine/gl/GLESRenderEngine.cpp

diff --git a/libs/renderengine/gl/GLESRenderEngine.cpp b/libs/renderengine/gl/GLESRenderEngine.cpp
index 699ffac..af97367 100644
--- a/libs/renderengine/gl/GLESRenderEngine.cpp
+++ b/libs/renderengine/gl/GLESRenderEngine.cpp
@@ -1274,7 +1274,8 @@
 
     if (color.a < 1.0f || !opaque || cornerRadius > 0.0f) {
         glEnable(GL_BLEND);
-        glBlendFunc(premultipliedAlpha ? GL_ONE : GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        glBlendFuncSeparate(premultipliedAlpha ? GL_ONE : GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+                            GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
     } else {
         glDisable(GL_BLEND);
     }

libs/renderengine/tests/RenderEngineTest.cpp

diff --git a/libs/renderengine/tests/RenderEngineTest.cpp b/libs/renderengine/tests/RenderEngineTest.cpp
index d44b5d1..0fec99b 100644
--- a/libs/renderengine/tests/RenderEngineTest.cpp
+++ b/libs/renderengine/tests/RenderEngineTest.cpp
@@ -917,7 +917,7 @@
 
 void RenderEngineTest::fillBufferWithoutPremultiplyAlpha() {
     fillRedBufferWithoutPremultiplyAlpha();
-    expectBufferColor(fullscreenRect(), 128, 0, 0, 64, 1);
+    expectBufferColor(fullscreenRect(), 128, 0, 0, 128, 1);
 }
 
 void RenderEngineTest::clearLeftRegion() {