Add all remaining separable xfer modes to GPU backend.

Review URL: https://codereview.chromium.org/14189024

git-svn-id: http://skia.googlecode.com/svn/trunk@8768 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 7 insertions, 4 deletions

diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index c5da0625e5..f960e14af7 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -87,6 +87,9 @@ public:
         [a, c] - Resulting (alpha, color) values
         For these equations, the colors are in premultiplied state.
         If no xfermode is specified, kSrcOver is assumed.
+        The modes are ordered by those that can be expressed as a pair of Coeffs, followed by those
+        that aren't Coeffs but have separable r,g,b computations, and finally
+        those that are not separable.
      */
     enum Mode {
         kClear_Mode,    //!< [0, 0]
@@ -107,9 +110,9 @@ public:
         // Following blend modes are defined in the CSS Compositing standard:
         // https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html#blending
         kScreen_Mode,
-        // all above modes can be expressed as pair of src/dst Coeffs
-        kCoeffModesCnt,
-        kOverlay_Mode = kCoeffModesCnt,
+        kLastCoeffMode = kScreen_Mode,
+
+        kOverlay_Mode,
         kDarken_Mode,
         kLighten_Mode,
         kColorDodge_Mode,
@@ -119,12 +122,12 @@ public:
         kDifference_Mode,
         kExclusion_Mode,
         kMultiply_Mode,
+        kLastSeparableMode = kMultiply_Mode,
 
         kHue_Mode,
         kSaturation_Mode,
         kColor_Mode,
         kLuminosity_Mode,
-
         kLastMode = kLuminosity_Mode
     };