aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gyp/opts.gyp2
-rw-r--r--src/opts/SkBlitMask_opts_arm.cpp18
-rw-r--r--src/opts/SkBlitMask_opts_none.cpp18
-rw-r--r--src/opts/SkBlitRow_opts_arm.cpp16
-rw-r--r--src/opts/SkBlitRow_opts_none.cpp18
5 files changed, 38 insertions, 34 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 8a48b9ad2a..4f5eda88f6 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -73,6 +73,7 @@
'../src/opts/opts_check_arm.cpp',
'../src/opts/memset.arm.S',
'../src/opts/SkBitmapProcState_opts_arm.cpp',
+ '../src/opts/SkBlitMask_opts_arm.cpp',
'../src/opts/SkBlitRow_opts_arm.cpp',
'../src/opts/SkBlitRow_opts_arm.h',
],
@@ -95,6 +96,7 @@
[ '(skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', {
'sources': [
'../src/opts/SkBitmapProcState_opts_none.cpp',
+ '../src/opts/SkBlitMask_opts_none.cpp',
'../src/opts/SkBlitRow_opts_none.cpp',
'../src/opts/SkUtils_opts_none.cpp',
],
diff --git a/src/opts/SkBlitMask_opts_arm.cpp b/src/opts/SkBlitMask_opts_arm.cpp
new file mode 100644
index 0000000000..0ad0919387
--- /dev/null
+++ b/src/opts/SkBlitMask_opts_arm.cpp
@@ -0,0 +1,18 @@
+
+#include "SkBlitMask.h"
+
+SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig,
+ SkMask::Format maskFormat,
+ SkColor color) {
+ return NULL;
+}
+
+SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
+ return NULL;
+}
+
+SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkBitmap::Config dstConfig,
+ SkMask::Format maskFormat,
+ RowFlags flags) {
+ return NULL;
+}
diff --git a/src/opts/SkBlitMask_opts_none.cpp b/src/opts/SkBlitMask_opts_none.cpp
new file mode 100644
index 0000000000..0ad0919387
--- /dev/null
+++ b/src/opts/SkBlitMask_opts_none.cpp
@@ -0,0 +1,18 @@
+
+#include "SkBlitMask.h"
+
+SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig,
+ SkMask::Format maskFormat,
+ SkColor color) {
+ return NULL;
+}
+
+SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
+ return NULL;
+}
+
+SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkBitmap::Config dstConfig,
+ SkMask::Format maskFormat,
+ RowFlags flags) {
+ return NULL;
+}
diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp
index 8eb7b1cfeb..cfd3f70d5f 100644
--- a/src/opts/SkBlitRow_opts_arm.cpp
+++ b/src/opts/SkBlitRow_opts_arm.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "SkBlitMask.h"
#include "SkBlitRow.h"
#include "SkColorPriv.h"
#include "SkDither.h"
@@ -378,18 +377,3 @@ SkBlitRow::ColorProc SkBlitRow::PlatformColorProc() {
return SK_ARM_NEON_WRAP(Color32_arm);
}
-SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig,
- SkMask::Format maskFormat,
- SkColor color) {
- return NULL;
-}
-
-SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
- return NULL;
-}
-
-SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkBitmap::Config dstConfig,
- SkMask::Format maskFormat,
- RowFlags flags) {
- return NULL;
-}
diff --git a/src/opts/SkBlitRow_opts_none.cpp b/src/opts/SkBlitRow_opts_none.cpp
index 0abcf59160..9ea2526cbc 100644
--- a/src/opts/SkBlitRow_opts_none.cpp
+++ b/src/opts/SkBlitRow_opts_none.cpp
@@ -6,7 +6,6 @@
*/
#include "SkBlitRow.h"
-#include "SkBlitMask.h"
// Platform impl of Platform_procs with no overrides
@@ -26,20 +25,3 @@ SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
return NULL;
}
-///////////////////////////////////////////////////////////////////////////////
-
-SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkBitmap::Config dstConfig,
- SkMask::Format maskFormat,
- SkColor color) {
- return NULL;
-}
-
-SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
- return NULL;
-}
-
-SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkBitmap::Config dstConfig,
- SkMask::Format maskFormat,
- RowFlags flags) {
- return NULL;
-}