simplify/unify xferproc api

include/core/SkXfermode.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkXfermode_DEFINED
@@ skipping 202 matching lines @@
         The xfermode will return a factory for which the caller will get a ref. It is up 
         to the caller to install it. XferProcessors cannot use a background texture.
       */
     virtual GrXPFactory* asXPFactory() const;
 #endif
 
     SK_TO_STRING_PUREVIRT()
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
     SK_DEFINE_FLATTENABLE_TYPE(SkXfermode)
 
-    enum PM4fFlags {
-        kSrcIsOpaque_PM4fFlag  = 1 << 0,
-        kDstIsSRGB_PM4fFlag    = 1 << 1,
+    enum D32Flags {
+        kSrcIsOpaque_D32Flag  = 1 << 0,
+        kSrcIsSingle_D32Flag  = 1 << 1,
+        kDstIsSRGB_D32Flag    = 1 << 2,
     };
-    struct PM4fState {
-        const SkXfermode* fXfer;
-        uint32_t          fFlags;
+    typedef void (*D32Proc)(const SkXfermode*, uint32_t dst[], const SkPM4f src[],
+                            int count, const SkAlpha coverage[]);
+    static D32Proc GetD32Proc(SkXfermode*, uint32_t flags);
+
+    enum D64Flags {
+        kSrcIsOpaque_D64Flag  = 1 << 0,
+        kSrcIsSingle_D64Flag  = 1 << 1,
+        kDstIsFloat16_D64Flag = 1 << 2, // else U16 bit components
     };
-    typedef void (*PM4fProc1)(const PM4fState&, uint32_t dst[], const SkPM4f& src,
-                              int count, const SkAlpha coverage[]);
-    typedef void (*PM4fProcN)(const PM4fState&, uint32_t dst[], const SkPM4f src[],
-                              int count, const SkAlpha coverage[]);
-
-    static PM4fProc1 GetPM4fProc1(Mode, uint32_t flags);
-    static PM4fProcN GetPM4fProcN(Mode, uint32_t flags);
-    virtual PM4fProc1 getPM4fProc1(uint32_t flags) const;
-    virtual PM4fProcN getPM4fProcN(uint32_t flags) const;
-
-    enum U64Flags {
-        kSrcIsOpaque_U64Flag  = 1 << 0,
-        kDstIsFloat16_U64Flag = 1 << 1, // else U16 bit components
-    };
-    struct U64State {
-        const SkXfermode* fXfer;
-        uint32_t          fFlags;
-    };
-    typedef void (*U64Proc1)(const U64State&, uint64_t dst[], const SkPM4f& src, int count,
-                             const SkAlpha coverage[]);
-    typedef void (*U64ProcN)(const U64State&, uint64_t dst[], const SkPM4f src[], int count,
-                             const SkAlpha coverage[]);
-    static U64Proc1 GetU64Proc1(Mode, uint32_t flags);
-    static U64ProcN GetU64ProcN(Mode, uint32_t flags);
+    typedef void (*D64Proc)(const SkXfermode*, uint64_t dst[], const SkPM4f src[], int count,
+                            const SkAlpha coverage[]);
+    static D64Proc GetD64Proc(SkXfermode*, uint32_t flags);
 
     enum LCDFlags {
         kSrcIsOpaque_LCDFlag    = 1 << 0,   // else src(s) may have alpha < 1
         kSrcIsSingle_LCDFlag    = 1 << 1,   // else src[count]
         kDstIsLinearInt_LCDFlag = 1 << 2,   // else srgb/half-float
     };
     typedef void (*LCD32Proc)(uint32_t* dst, const SkPM4f* src, int count, const uint16_t lcd[]);
     typedef void (*LCD64Proc)(uint64_t* dst, const SkPM4f* src, int count, const uint16_t lcd[]);
     static LCD32Proc GetLCD32Proc(uint32_t flags);
     static LCD64Proc GetLCD64Proc(uint32_t) { return nullptr; }
 
 protected:
     SkXfermode() {}
     /** The default implementation of xfer32/xfer16/xferA8 in turn call this
         method, 1 color at a time (upscaled to a SkPMColor). The default
         implementation of this method just returns dst. If performance is
         important, your subclass should override xfer32/xfer16/xferA8 directly.
 
         This method will not be called directly by the client, so it need not
         be implemented if your subclass has overridden xfer32/xfer16/xferA8
     */
     virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const;
 
+    virtual D32Proc onGetD32Proc(uint32_t flags) const;
+    virtual D64Proc onGetD64Proc(uint32_t flags) const;
+
 private:
     enum {
         kModeCount = kLastMode + 1
     };
 
     typedef SkFlattenable INHERITED;
 };
 
 #endif