Revert "ARM Skia NEON patches - 28 - Xfermode: SIMD modeprocs"
This reverts http://code.google.com/p/skia/source/detail?r=11654
Review URL: https://codereview.chromium.org/26340010
git-svn-id: http://skia.googlecode.com/svn/trunk/src@11655 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/SkXfermode.cpp b/core/SkXfermode.cpp
index 6f2fee6..8c6eb2c 100644
--- a/core/SkXfermode.cpp
+++ b/core/SkXfermode.cpp
@@ -8,7 +8,6 @@
#include "SkXfermode.h"
-#include "SkXfermode_proccoeff.h"
#include "SkColorPriv.h"
#include "SkFlattenableBuffers.h"
#include "SkMathPriv.h"
@@ -625,7 +624,16 @@
return SkPackARGB32(a, r, g, b);
}
-const ProcCoeff gProcCoeffs[] = {
+
+struct ProcCoeff {
+ SkXfermodeProc fProc;
+ SkXfermode::Coeff fSC;
+ SkXfermode::Coeff fDC;
+};
+
+#define CANNOT_USE_COEFF SkXfermode::Coeff(-1)
+
+static const ProcCoeff gProcCoeffs[] = {
{ clear_modeproc, SkXfermode::kZero_Coeff, SkXfermode::kZero_Coeff },
{ src_modeproc, SkXfermode::kOne_Coeff, SkXfermode::kZero_Coeff },
{ dst_modeproc, SkXfermode::kZero_Coeff, SkXfermode::kOne_Coeff },
@@ -1337,51 +1345,83 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-bool SkProcCoeffXfermode::asMode(Mode* mode) const {
- if (mode) {
- *mode = fMode;
- }
- return true;
-}
-
-bool SkProcCoeffXfermode::asCoeff(Coeff* sc, Coeff* dc) const {
- if (CANNOT_USE_COEFF == fSrcCoeff) {
- return false;
+class SkProcCoeffXfermode : public SkProcXfermode {
+public:
+ SkProcCoeffXfermode(const ProcCoeff& rec, Mode mode)
+ : INHERITED(rec.fProc) {
+ fMode = mode;
+ // these may be valid, or may be CANNOT_USE_COEFF
+ fSrcCoeff = rec.fSC;
+ fDstCoeff = rec.fDC;
}
- if (sc) {
- *sc = fSrcCoeff;
- }
- if (dc) {
- *dc = fDstCoeff;
- }
- return true;
-}
-
-#if SK_SUPPORT_GPU
-bool SkProcCoeffXfermode::asNewEffectOrCoeff(GrContext*,
- GrEffectRef** effect,
- Coeff* src,
- Coeff* dst,
- GrTexture* background) const {
- if (this->asCoeff(src, dst)) {
- return true;
- }
- if (XferEffect::IsSupportedMode(fMode)) {
- if (NULL != effect) {
- *effect = XferEffect::Create(fMode, background);
- SkASSERT(NULL != *effect);
+ virtual bool asMode(Mode* mode) const SK_OVERRIDE {
+ if (mode) {
+ *mode = fMode;
}
return true;
}
- return false;
-}
+
+ virtual bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE {
+ if (CANNOT_USE_COEFF == fSrcCoeff) {
+ return false;
+ }
+
+ if (sc) {
+ *sc = fSrcCoeff;
+ }
+ if (dc) {
+ *dc = fDstCoeff;
+ }
+ return true;
+ }
+
+#if SK_SUPPORT_GPU
+ virtual bool asNewEffectOrCoeff(GrContext*,
+ GrEffectRef** effect,
+ Coeff* src,
+ Coeff* dst,
+ GrTexture* background) const SK_OVERRIDE {
+ if (this->asCoeff(src, dst)) {
+ return true;
+ }
+ if (XferEffect::IsSupportedMode(fMode)) {
+ if (NULL != effect) {
+ *effect = XferEffect::Create(fMode, background);
+ SkASSERT(NULL != *effect);
+ }
+ return true;
+ }
+ return false;
+ }
#endif
-void SkProcCoeffXfermode::flatten(SkFlattenableWriteBuffer& buffer) const {
- this->INHERITED::flatten(buffer);
- buffer.write32(fMode);
-}
+ SK_DEVELOPER_TO_STRING()
+ SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode)
+
+protected:
+ SkProcCoeffXfermode(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
+ fMode = (SkXfermode::Mode)buffer.read32();
+
+ const ProcCoeff& rec = gProcCoeffs[fMode];
+ // these may be valid, or may be CANNOT_USE_COEFF
+ fSrcCoeff = rec.fSC;
+ fDstCoeff = rec.fDC;
+ // now update our function-ptr in the super class
+ this->INHERITED::setProc(rec.fProc);
+ }
+
+ virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {
+ this->INHERITED::flatten(buffer);
+ buffer.write32(fMode);
+ }
+
+private:
+ Mode fMode;
+ Coeff fSrcCoeff, fDstCoeff;
+
+ typedef SkProcXfermode INHERITED;
+};
const char* SkXfermode::ModeName(Mode mode) {
SkASSERT((unsigned) mode <= (unsigned)kLastMode);
@@ -1653,9 +1693,6 @@
}
}
-extern SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
- SkXfermode::Mode mode);
-
SkXfermode* SkXfermode::Create(Mode mode) {
SkASSERT(SK_ARRAY_COUNT(gProcCoeffs) == kModeCount);
SkASSERT(SK_ARRAY_COUNT(gCachedXfermodes) == kModeCount);
@@ -1677,36 +1714,29 @@
SkXfermode* xfer = gCachedXfermodes[mode];
if (NULL == xfer) {
const ProcCoeff& rec = gProcCoeffs[mode];
-
- // 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) {
- case kClear_Mode:
- xfer = SkNEW_ARGS(SkClearXfermode, (rec));
- break;
- case kSrc_Mode:
- xfer = SkNEW_ARGS(SkSrcXfermode, (rec));
- break;
- case kSrcOver_Mode:
- SkASSERT(false); // should not land here
- break;
- case kDstIn_Mode:
- xfer = SkNEW_ARGS(SkDstInXfermode, (rec));
- break;
- case kDstOut_Mode:
- xfer = SkNEW_ARGS(SkDstOutXfermode, (rec));
- break;
- default:
- // no special-case, just rely in the rec and its function-ptrs
- xfer = SkNEW_ARGS(SkProcCoeffXfermode, (rec, mode));
- break;
- }
+ // 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) {
+ case kClear_Mode:
+ xfer = SkNEW_ARGS(SkClearXfermode, (rec));
+ break;
+ case kSrc_Mode:
+ xfer = SkNEW_ARGS(SkSrcXfermode, (rec));
+ break;
+ case kSrcOver_Mode:
+ SkASSERT(false); // should not land here
+ break;
+ case kDstIn_Mode:
+ xfer = SkNEW_ARGS(SkDstInXfermode, (rec));
+ break;
+ case kDstOut_Mode:
+ xfer = SkNEW_ARGS(SkDstOutXfermode, (rec));
+ break;
+ default:
+ // no special-case, just rely in the rec and its function-ptrs
+ xfer = SkNEW_ARGS(SkProcCoeffXfermode, (rec, mode));
+ break;
}
gCachedXfermodes[mode] = xfer;
}
diff --git a/core/SkXfermode_proccoeff.h b/core/SkXfermode_proccoeff.h
deleted file mode 100644
index 60ebe3f..0000000
--- a/core/SkXfermode_proccoeff.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef SkXfermode_proccoeff_DEFINED
-#define SkXfermode_proccoeff_DEFINED
-
-#include "SkXfermode.h"
-#include "SkFlattenableBuffers.h"
-
-struct ProcCoeff {
- SkXfermodeProc fProc;
- SkXfermode::Coeff fSC;
- SkXfermode::Coeff fDC;
-};
-
-#define CANNOT_USE_COEFF SkXfermode::Coeff(-1)
-
-extern const ProcCoeff gProcCoeffs[];
-
-class SkProcCoeffXfermode : public SkProcXfermode {
-public:
- SkProcCoeffXfermode(const ProcCoeff& rec, Mode mode)
- : INHERITED(rec.fProc) {
- fMode = mode;
- // these may be valid, or may be CANNOT_USE_COEFF
- fSrcCoeff = rec.fSC;
- fDstCoeff = rec.fDC;
- }
-
- virtual bool asMode(Mode* mode) const SK_OVERRIDE;
-
- virtual bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE;
-
-#if SK_SUPPORT_GPU
- virtual bool asNewEffectOrCoeff(GrContext*,
- GrEffectRef** effect,
- Coeff* src,
- Coeff* dst,
- GrTexture* background) const SK_OVERRIDE;
-#endif
-
- SK_DEVELOPER_TO_STRING()
- SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode)
-
-protected:
- SkProcCoeffXfermode(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
- fMode = (SkXfermode::Mode)buffer.read32();
-
- const ProcCoeff& rec = gProcCoeffs[fMode];
- // these may be valid, or may be CANNOT_USE_COEFF
- fSrcCoeff = rec.fSC;
- fDstCoeff = rec.fDC;
- // now update our function-ptr in the super class
- this->INHERITED::setProc(rec.fProc);
- }
-
- virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE;
-
-private:
- Mode fMode;
- Coeff fSrcCoeff, fDstCoeff;
-
- typedef SkProcXfermode INHERITED;
-};
-
-#endif // #ifndef SkXfermode_proccoeff_DEFINED
diff --git a/opts/SkXfermode_opts_arm.cpp b/opts/SkXfermode_opts_arm.cpp
deleted file mode 100644
index d618335..0000000
--- a/opts/SkXfermode_opts_arm.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-#include "SkXfermode.h"
-#include "SkXfermode_proccoeff.h"
-#include "SkColorPriv.h"
-#include "SkUtilsArm.h"
-
-#if !SK_ARM_NEON_IS_NONE
-
-#include <arm_neon.h>
-
-////////////////////////////////////////////////////////////////////////////////
-
-typedef uint8x8x4_t (*SkXfermodeProcSIMD)(uint8x8x4_t src, uint8x8x4_t dst);
-
-class SkNEONProcCoeffXfermode : public SkProcCoeffXfermode {
-public:
- SkNEONProcCoeffXfermode(const ProcCoeff& rec, SkXfermode::Mode mode,
- SkXfermodeProcSIMD procSIMD)
- : INHERITED(rec, mode), fProcSIMD(procSIMD) {}
-
- virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
- const SkAlpha aa[]) const SK_OVERRIDE;
-private:
- SkXfermodeProcSIMD fProcSIMD;
- typedef SkProcCoeffXfermode INHERITED;
-};
-
-
-void SkNEONProcCoeffXfermode::xfer32(SkPMColor dst[], const SkPMColor src[],
- int count, const SkAlpha aa[]) const {
- SkASSERT(dst && src && count >= 0);
-
- SkXfermodeProc proc = this->getProc();
- SkXfermodeProcSIMD procSIMD = fProcSIMD;
-
- if (NULL == aa) {
- // Unrolled NEON code
- while (count >= 8) {
- uint8x8x4_t vsrc, vdst, vres;
-
- asm volatile (
- "vld4.u8 %h[vsrc], [%[src]]! \t\n"
- "vld4.u8 %h[vdst], [%[dst]] \t\n"
- : [vsrc] "=w" (vsrc), [vdst] "=w" (vdst)
- : [src] "r" (src), [dst] "r" (dst)
- :
- );
-
- vres = procSIMD(vsrc, vdst);
-
- vst4_u8((uint8_t*)dst, vres);
-
- count -= 8;
- dst += 8;
- }
- // Leftovers
- for (int i = 0; i < count; i++) {
- dst[i] = proc(src[i], dst[i]);
- }
- } else {
- for (int i = count - 1; i >= 0; --i) {
- unsigned a = aa[i];
- if (0 != a) {
- SkPMColor dstC = dst[i];
- SkPMColor C = proc(src[i], dstC);
- if (a != 0xFF) {
- C = SkFourByteInterp(C, dstC, a);
- }
- dst[i] = C;
- }
- }
- }
-}
-
-#ifdef SK_DEVELOPER
-void SkNEONProcCoeffXfermode::toString(SkString* str) const {
- this->INHERITED::toString(str);
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-SkXfermodeProcSIMD gNEONXfermodeProcs[] = {
- [SkXfermode::kClear_Mode] = NULL,
- [SkXfermode::kSrc_Mode] = NULL,
- [SkXfermode::kDst_Mode] = NULL,
- [SkXfermode::kSrcOver_Mode] = NULL,
- [SkXfermode::kDstOver_Mode] = NULL,
- [SkXfermode::kSrcIn_Mode] = NULL,
- [SkXfermode::kDstIn_Mode] = NULL,
- [SkXfermode::kSrcOut_Mode] = NULL,
- [SkXfermode::kDstOut_Mode] = NULL,
- [SkXfermode::kSrcATop_Mode] = NULL,
- [SkXfermode::kDstATop_Mode] = NULL,
- [SkXfermode::kXor_Mode] = NULL,
- [SkXfermode::kPlus_Mode] = NULL,
- [SkXfermode::kModulate_Mode]= NULL,
- [SkXfermode::kScreen_Mode] = NULL,
-
- [SkXfermode::kOverlay_Mode] = NULL,
- [SkXfermode::kDarken_Mode] = NULL,
- [SkXfermode::kLighten_Mode] = NULL,
- [SkXfermode::kColorDodge_Mode] = NULL,
- [SkXfermode::kColorBurn_Mode] = NULL,
- [SkXfermode::kHardLight_Mode] = NULL,
- [SkXfermode::kSoftLight_Mode] = NULL,
- [SkXfermode::kDifference_Mode] = NULL,
- [SkXfermode::kExclusion_Mode] = NULL,
- [SkXfermode::kMultiply_Mode] = NULL,
-
- [SkXfermode::kHue_Mode] = NULL,
- [SkXfermode::kSaturation_Mode] = NULL,
- [SkXfermode::kColor_Mode] = NULL,
- [SkXfermode::kLuminosity_Mode] = NULL,
-};
-
-SK_COMPILE_ASSERT(
- SK_ARRAY_COUNT(gNEONXfermodeProcs) == SkXfermode::kLastMode + 1,
- mode_count_arm
-);
-
-#endif
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
- SkXfermode::Mode mode) {
-#if !SK_ARM_NEON_IS_NONE
- #if SK_ARM_NEON_IS_DYNAMIC
- if ((sk_cpu_arm_has_neon()) && (gNEONXfermodeProcs[mode] != NULL)) {
- #elif SK_ARM_NEON_IS_ALWAYS
- if (gNEONXfermodeProcs[mode] != NULL) {
- #endif
- return SkNEW_ARGS(SkNEONProcCoeffXfermode,
- (rec, mode, gNEONXfermodeProcs[mode]));
- }
-#endif
- return NULL;
-}
diff --git a/opts/SkXfermode_opts_none.cpp b/opts/SkXfermode_opts_none.cpp
deleted file mode 100644
index ca53fa0..0000000
--- a/opts/SkXfermode_opts_none.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "SkXfermode.h"
-#include "SkXfermode_proccoeff.h"
-
-// The prototype below is for Clang
-extern SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
- SkXfermode::Mode mode);
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
- SkXfermode::Mode mode) {
- return NULL;
-}
