diff options
author | mtklein <mtklein@chromium.org> | 2015-05-22 12:43:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-22 12:43:41 -0700 |
commit | 4e506c200bc7f0c59fa1092577c129d9723a1c6e (patch) | |
tree | 575e0bcb1ab6634e2a293b77920d878ab268f93f /src | |
parent | 08bf86d1b7b03cc6829f2488d9adcb0502e84b97 (diff) |
Simpler version of Plus w/ AA. ~25% faster too.
BUG=skia:3852
TBR=fmalita@chromium.org
Review URL: https://codereview.chromium.org/1150693003
Diffstat (limited to 'src')
-rw-r--r-- | src/core/Sk4pxXfermode.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/Sk4pxXfermode.h b/src/core/Sk4pxXfermode.h index ff26436134..e8610edaba 100644 --- a/src/core/Sk4pxXfermode.h +++ b/src/core/Sk4pxXfermode.h @@ -89,10 +89,8 @@ static Sk4px xfer_aa(const Sk4px& s, const Sk4px& d, const Sk16b& aa) { template <> Sk4px xfer_aa<Name>(const Sk4px& s, const Sk4px& d, const Sk16b& aa) // Plus' clamp needs to happen after AA. skia:3852 - XFERMODE_AA(Plus) { // [ clamp(D + AA*S) ] - // We implement this as D + Min(S*AA, (1-D)) to fit the arguments to Min in 16 bits. - return d + - Sk4px::Wide(Sk16h::Min(s.mulWiden(aa), d.inv().mul255Widen())).div255RoundNarrow(); + XFERMODE_AA(Plus) { // [ clamp( (1-AA)D + (AA)(S+D) ) == clamp(D + AA*S) ] + return d.saturatedAdd(s.fastMulDiv255Round(aa)); } #undef XFERMODE_AA |