Clean up order of arguments to d,s[,aa].

src/opts/SkXfermode_opts.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef Sk4pxXfermode_DEFINED
 #define Sk4pxXfermode_DEFINED
 
 #include "Sk4px.h"
 #include "SkNx.h"
 #include "SkXfermode_proccoeff.h"
 
 namespace {
 
 // Most xfermodes can be done most efficiently 4 pixels at a time in 8 or 16-bit fixed point.
 #define XFERMODE(Xfermode) \
     struct Xfermode { Sk4px operator()(const Sk4px&, const Sk4px&) const; }; \
-    inline Sk4px Xfermode::operator()(const Sk4px& s, const Sk4px& d) const
+    inline Sk4px Xfermode::operator()(const Sk4px& d, const Sk4px& s) const
 
 XFERMODE(Clear) { return Sk4px::DupPMColor(0); }
 XFERMODE(Src)   { return s; }
 XFERMODE(Dst)   { return d; }
 XFERMODE(SrcIn)   { return     s.approxMulDiv255(d.alphas()      ); }
 XFERMODE(SrcOut)  { return     s.approxMulDiv255(d.alphas().inv()); }
 XFERMODE(SrcOver) { return s + d.approxMulDiv255(s.alphas().inv()); }
-XFERMODE(DstIn)   { return SrcIn  ()(d,s); }
-XFERMODE(DstOut)  { return SrcOut ()(d,s); }
-XFERMODE(DstOver) { return SrcOver()(d,s); }
+XFERMODE(DstIn)   { return SrcIn  ()(s,d); }
+XFERMODE(DstOut)  { return SrcOut ()(s,d); }
+XFERMODE(DstOver) { return SrcOver()(s,d); }
 
 // [ S * Da + (1 - Sa) * D]
 XFERMODE(SrcATop) { return (s * d.alphas() + d * s.alphas().inv()).div255(); }
-XFERMODE(DstATop) { return SrcATop()(d,s); }
+XFERMODE(DstATop) { return SrcATop()(s,d); }
 //[ S * (1 - Da) + (1 - Sa) * D ]
 XFERMODE(Xor) { return (s * d.alphas().inv() + d * s.alphas().inv()).div255(); }
 // [S + D ]
 XFERMODE(Plus) { return s.saturatedAdd(d); }
 // [S * D ]
 XFERMODE(Modulate) { return s.approxMulDiv255(d); }
 // [S + D - S * D]
 XFERMODE(Screen) {
     // Doing the math as S + (1-S)*D or S + (D - S*D) means the add and subtract can be done
     // in 8-bit space without overflow.  S + (1-S)*D is a touch faster because inv() is cheap.
@@ skipping 29 matching lines @@
     auto isLite = ((sa-s) < s).widenLoHi();
 
     auto lite = sa*da - ((da-d)*(sa-s) << 1),
          dark = s*d << 1,
          both = s*da.inv() + d*sa.inv();
 
     auto alphas = srcover;
     auto colors = (both + isLite.thenElse(lite, dark)).div255();
     return alphas.zeroColors() + colors.zeroAlphas();
 }
-XFERMODE(Overlay) { return HardLight()(d,s); }
+XFERMODE(Overlay) { return HardLight()(s,d); }
 
 XFERMODE(Darken) {
     auto sa = s.alphas(),
          da = d.alphas();
 
     auto sda = (s*da).div255(),
          dsa = (d*sa).div255();
 
     auto srcover = s + (d * sa.inv()).div255(),
          dstover = d + (s * da.inv()).div255();
@@ skipping 84 matching lines @@
     auto alpha  = s + d*isa;
     auto colors = s*ida + d*isa + (s2 <= sa).thenElse(darkSrc, liteSrc);           // Case 1 or 2/3?
 
     return a_rgb(alpha, colors);
 }
 #undef XFERMODE
 
 // A reasonable fallback mode for doing AA is to simply apply the transfermode first,
 // then linearly interpolate the AA.
 template <typename Xfermode>
-static Sk4px xfer_aa(const Sk4px& s, const Sk4px& d, const Sk4px& aa) {
-    Sk4px bw = Xfermode()(s, d);
+static Sk4px xfer_aa(const Sk4px& d, const Sk4px& s, const Sk4px& aa) {
+    Sk4px bw = Xfermode()(d, s);
     return (bw * aa + d * aa.inv()).div255();
 }
 
 // For some transfermodes we specialize AA, either for correctness or performance.
 #define XFERMODE_AA(Xfermode) \
-    template <> Sk4px xfer_aa<Xfermode>(const Sk4px& s, const Sk4px& d, const Sk4px& aa)
+    template <> Sk4px xfer_aa<Xfermode>(const Sk4px& d, const Sk4px& s, const Sk4px& aa)
 
 // Plus' clamp needs to happen after AA.  skia:3852
 XFERMODE_AA(Plus) {  // [ clamp( (1-AA)D + (AA)(S+D) ) == clamp(D + AA*S) ]
     return d.saturatedAdd(s.approxMulDiv255(aa));
 }
 
 #undef XFERMODE_AA
 
 template <typename Xfermode>
 class Sk4pxXfermode : public SkProcCoeffXfermode {
 public:
     Sk4pxXfermode(const ProcCoeff& rec, SkXfermode::Mode mode)
         : INHERITED(rec, mode) {}
 
     void xfer32(SkPMColor dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
         if (nullptr == aa) {
-            Sk4px::MapDstSrc(n, dst, src, [&](const Sk4px& dst4, const Sk4px& src4) {
-                return Xfermode()(src4, dst4);
-            });
+            Sk4px::MapDstSrc(n, dst, src, Xfermode());
         } else {
-            Sk4px::MapDstSrcAlpha(n, dst, src, aa,
-                    [&](const Sk4px& dst4, const Sk4px& src4, const Sk4px& alpha) {
-                return xfer_aa<Xfermode>(src4, dst4, alpha);
-           });
+            Sk4px::MapDstSrcAlpha(n, dst, src, aa, xfer_aa<Xfermode>);
         }
     }
 
     void xfer16(uint16_t dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
         SkPMColor dst32[4];
         while (n >= 4) {
             dst32[0] = SkPixel16ToPixel32(dst[0]);
             dst32[1] = SkPixel16ToPixel32(dst[1]);
             dst32[2] = SkPixel16ToPixel32(dst[2]);
             dst32[3] = SkPixel16ToPixel32(dst[3]);
@@ skipping 111 matching lines @@
     #undef CASE
 
         default: break;
     }
     return nullptr;
 }
 
 } // namespace SK_OPTS_NS
 
 #endif//Sk4pxXfermode_DEFINED