summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2014-08-18 15:54:13 -0400
committerDerek Sollenberger <djsollen@google.com>2014-08-18 15:54:13 -0400
commit79c9f9168919b0fbb26f8ecd5704875dbc6a539b (patch)
tree4cdc23263a2b5c73ef3087343ab29c4c5806f602 /libs
parent95d9ad0f79c900db9bca1745100f14d0ec9cc133 (diff)
downloadframeworks_base-79c9f9168919b0fbb26f8ecd5704875dbc6a539b.zip
frameworks_base-79c9f9168919b0fbb26f8ecd5704875dbc6a539b.tar.gz
frameworks_base-79c9f9168919b0fbb26f8ecd5704875dbc6a539b.tar.bz2
Remove invalid premul step from HWUI's matrix color filter.
bug: 16186699 Change-Id: Ia0b828e76ce4831ee9e3b4f54c697e6017f1604d
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/ProgramCache.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index c802b18..c38f136 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -328,8 +328,7 @@ const char* gFS_Main_ApplyColorOp[3] = {
"",
// Matrix
" fragColor *= colorMatrix;\n"
- " fragColor += colorMatrixVector;\n"
- " fragColor.rgb *= fragColor.a;\n",
+ " fragColor += colorMatrixVector;\n",
// PorterDuff
" fragColor = blendColors(colorBlend, fragColor);\n"
};