aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-08-05 14:17:32 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-05 14:17:32 -0700
commitf62833d9c9075dd1028ef4395e3370d2597d9115 (patch)
tree8319f4f020dcbd9261acbc9371b860e74bca33c9 /src/core
parent7b77ac100e98f1037ae907c8830b808361f211e1 (diff)
Detect MIPS DSP and DSPR2 programattically.
Procedure: $ platform_tools/android/toolchains/ndk-r10c-mips-darwin_v14/bin/mipsel-linux-android-gcc -dM -E - < /dev/null | sort > vanilla.mips $ platform_tools/android/toolchains/ndk-r10c-mips-darwin_v14/bin/mipsel-linux-android-gcc -mdsp -dM -E - < /dev/null | sort > dsp.mips $ platform_tools/android/toolchains/ndk-r10c-mips-darwin_v14/bin/mipsel-linux-android-gcc -mdspr2 -dM -E - < /dev/null | sort > dspr2.mips $ diff vanilla.mips dsp.mips 239a240,241 > #define __mips_dsp 1 > #define __mips_dsp_rev 1 $ diff vanilla.mips dspr2.mips 239a240,242 > #define __mips_dsp 1 > #define __mips_dsp_rev 2 > #define __mips_dspr2 1 So, defined(__mips_dsp) -> SK_MIPS_HAS_DSP, defined(__mips_dspr2) -> SK_MIPS_HAS_DSPR2. BUG=skia: Review URL: https://codereview.chromium.org/1274873002
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkBlitter_RGB16.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp
index 8caf908312..d87c636590 100644
--- a/src/core/SkBlitter_RGB16.cpp
+++ b/src/core/SkBlitter_RGB16.cpp
@@ -14,7 +14,7 @@
#include "SkUtilsArm.h"
#include "SkXfermode.h"
-#if SK_MIPS_HAS_DSP
+#if defined(__mips_dsp)
extern void blitmask_d565_opaque_mips(int width, int height, uint16_t* device,
unsigned deviceRB, const uint8_t* alpha,
uint32_t expanded32, unsigned maskRB);
@@ -374,7 +374,7 @@ void SkRGB16_Opaque_Blitter::blitAntiH(int x, int y,
#define SK_BLITBWMASK_DEVTYPE uint16_t
#include "SkBlitBWMaskTemplate.h"
-#if !defined(SK_MIPS_HAS_DSP)
+#if !defined(__mips_dsp)
static U16CPU blend_compact(uint32_t src32, uint32_t dst32, unsigned scale5) {
return SkCompact_rgb_16(dst32 + ((src32 - dst32) * scale5 >> 5));
}
@@ -465,7 +465,7 @@ void SkRGB16_Opaque_Blitter::blitMask(const SkMask& mask,
alpha += maskRB;
} while (--height != 0);
#undef UNROLL
-#elif SK_MIPS_HAS_DSP
+#elif defined(__mips_dsp)
blitmask_d565_opaque_mips(width, height, device, deviceRB, alpha, expanded32, maskRB);
#else // non-neon code
do {