diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-09-04 15:01:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 15:01:28 +0000 |
| commit | e23b8dd58fba275802d48fccb43170845aac0382 (patch) | |
| tree | 9a72ffb27ce22a44ef60b8583815f3c31bf732c5 /libs/hwui/ProgramCache.cpp | |
| parent | 3884715c450e4ff519da73389abe36415028a0dc (diff) | |
| parent | 79c9f9168919b0fbb26f8ecd5704875dbc6a539b (diff) | |
| download | frameworks_base-e23b8dd58fba275802d48fccb43170845aac0382.zip frameworks_base-e23b8dd58fba275802d48fccb43170845aac0382.tar.gz frameworks_base-e23b8dd58fba275802d48fccb43170845aac0382.tar.bz2 | |
Merge "Remove invalid premul step from HWUI's matrix color filter." into lmp-dev
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
| -rw-r--r-- | libs/hwui/ProgramCache.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp index 23fe1b9..a8b8b16 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" }; |