commit f95a1f03c188a9c6b51e849c1a959131f59e53da
author Haixia Shi <hshi@google.com> Wed Oct 14 01:31:29 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 14 01:31:29 2015 +0000
tree 6281d36fe11de19e8dd0732ad3570e368d26c4ac
parent acba14be77a39f6a1336f5751e99ff83f2df8ec1
parent 19742e39efa8658fdb884fa614a695a7ff8c0888

Merge "drm_hwcomposer: fix logic error in premult blending" into mnc-dr-dev

glworker.cpp

diff --git a/glworker.cpp b/glworker.cpp
index ffb4182..118b397 100644
--- a/glworker.cpp
+++ b/glworker.cpp
@@ -214,9 +214,9 @@
 "  float alphaCover = 1.0;                                                  \n"
 "  for (int i = 0; i < LAYER_COUNT; i++) {                                  \n"
 "    vec4 texSample = texture2D(uLayerTextures[i], fTexCoords[i]);          \n"
-"    float a = texSample.a * uLayerAlpha[i];                                \n"
-"    color += max(a, uLayerPremult[i]) * alphaCover * texSample.rgb;        \n"
-"    alphaCover *= 1.0 - a;                                                 \n"
+"    vec3 multRgb = texSample.rgb * max(texSample.a, uLayerPremult[i]);     \n"
+"    color += multRgb * uLayerAlpha[i] * alphaCover;                        \n"
+"    alphaCover *= 1.0 - texSample.a * uLayerAlpha[i];                      \n"
 "    if (alphaCover <= 0.5/255.0)                                           \n"
 "      break;                                                               \n"
 "  }                                                                        \n"