ARM Skia NEON patches - 32 - Xfermode: 1-pixel NEON modeprocs

src/core/SkXfermode.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkXfermode.h"
@@ skipping 1653 matching lines @@
     SkAutoMutexAcquire ac(gCachedXfermodesMutex);
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gCachedXfermodes); ++i) {
         SkSafeUnref(gCachedXfermodes[i]);
         gCachedXfermodes[i] = NULL;
     }
 }
 
 extern SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
                                                       SkXfermode::Mode mode);
+extern SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode);
 
 SkXfermode* SkXfermode::Create(Mode mode) {
     SkASSERT(SK_ARRAY_COUNT(gProcCoeffs) == kModeCount);
     SkASSERT(SK_ARRAY_COUNT(gCachedXfermodes) == kModeCount);
 
     if ((unsigned)mode >= kModeCount) {
         // report error
         return NULL;
     }
 
     // Skia's "defaut" mode is srcover. NULL in SkPaint is interpreted as srcover
     // so we can just return NULL from the factory.
     if (kSrcOver_Mode == mode) {
         return NULL;
     }
 
     // guard our access to gCachedXfermodes, since we may write into it
     SkAutoMutexAcquire ac(gCachedXfermodesMutex);
 
     SkXfermode* xfer = gCachedXfermodes[mode];
     if (NULL == xfer) {
-        const ProcCoeff& rec = gProcCoeffs[mode];
+        ProcCoeff rec = gProcCoeffs[mode];
+
+        SkXfermodeProc pp = SkPlatformXfermodeProcFactory(mode);
+
+        if (pp != NULL) {
+            rec.fProc = pp;
+        }
 
         // check if we have a platform optim for that
         SkProcCoeffXfermode* xfm = SkPlatformXfermodeFactory(rec, mode);
         if (xfm != NULL) {
             xfer = xfm;
         } else {
             // All modes can in theory be represented by the ProcCoeff rec, since
             // it contains function ptrs. However, a few modes are both simple and
             // commonly used, so we call those out for their own subclasses here.
             switch (mode) {
@@ skipping 257 matching lines @@
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkClearXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSrcXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDstInXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDstOutXfermode)
 #if !SK_ARM_NEON_IS_NONE
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkNEONProcCoeffXfermode)
 #endif
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END