summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-09-24 16:01:35 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-09-25 09:33:22 -0700
commite83221c547cf2038752e5378e72e49a62cfd9954 (patch)
tree04530c1c08620b4c2c5b8209dc6bf7ba713d3f50 /libs/hwui/ProgramCache.cpp
parentf8538594fe6ba6db3310da042597840601d78cda (diff)
Fix alpha channel computation with ColorMatrixColorFilter
Bug #7222476 There were two issues: - Blending was ignored with color filters - The addition vector of a color filter was treated as integer values instead of float values Change-Id: Id94065704a30ee8aaaa5724a9f3a3cff7c50ced7
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
-rw-r--r--libs/hwui/ProgramCache.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index c81319eb2a59..7bc2b376b43b 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -347,7 +347,6 @@ const char* gFS_Main_ApplyColorOp[4] = {
// None
"",
// Matrix
- // TODO: Fix premultiplied alpha computations for color matrix
" fragColor *= colorMatrix;\n"
" fragColor += colorMatrixVector;\n"
" fragColor.rgb *= fragColor.a;\n",