diff options
| author |  mtklein <mtklein@chromium.org> | 2015-08-18 10:00:29 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-18 10:00:29 -0700 |
| commit | b2a327094f2b9a072fddfd440481b1c0a8b0bc80 (patch) | |
| tree | ee212320061f66c24d92b9d51f2de327f56870ba /src/opts | |
| parent | 9dc2a9a972b1eb5c3bc8ee5952676250084c68b5 (diff) | |
Update SkOpts namespaces.
portable -> default, and everyone gets an sk_ prefix.
BUG=skia:4117
Review URL: https://codereview.chromium.org/1299013003
Diffstat (limited to 'src/opts')
| -rw-r--r-- | src/opts/SkOpts_neon.cpp | 30 | ||||
| -rw-r--r-- | src/opts/SkOpts_sse41.cpp | 8 | ||||
| -rw-r--r-- | src/opts/SkOpts_ssse3.cpp | 6 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/opts/SkOpts_neon.cpp b/src/opts/SkOpts_neon.cpp index aa184d8ef4..c9c78a6759 100644 --- a/src/opts/SkOpts_neon.cpp +++ b/src/opts/SkOpts_neon.cpp @@ -7,7 +7,7 @@ #include "SkOpts.h" -#define SK_OPTS_NS neon +#define SK_OPTS_NS sk_neon #include "SkBlitMask_opts.h" #include "SkBlurImageFilter_opts.h" #include "SkColorCubeFilter_opts.h" @@ -19,25 +19,25 @@ namespace SkOpts { void Init_neon() { - rsqrt = neon::rsqrt; - memset16 = neon::memset16; - memset32 = neon::memset32; + rsqrt = sk_neon::rsqrt; + memset16 = sk_neon::memset16; + memset32 = sk_neon::memset32; create_xfermode = SkCreate4pxXfermode; - box_blur_xx = neon::box_blur_xx; - box_blur_xy = neon::box_blur_xy; - box_blur_yx = neon::box_blur_yx; + box_blur_xx = sk_neon::box_blur_xx; + box_blur_xy = sk_neon::box_blur_xy; + box_blur_yx = sk_neon::box_blur_yx; - dilate_x = neon::dilate_x; - dilate_y = neon::dilate_y; - erode_x = neon::erode_x; - erode_y = neon::erode_y; + dilate_x = sk_neon::dilate_x; + dilate_y = sk_neon::dilate_y; + erode_x = sk_neon::erode_x; + erode_y = sk_neon::erode_y; - texture_compressor = neon::texture_compressor; - fill_block_dimensions = neon::fill_block_dimensions; + texture_compressor = sk_neon::texture_compressor; + fill_block_dimensions = sk_neon::fill_block_dimensions; - blit_mask_d32_a8 = neon::blit_mask_d32_a8; + blit_mask_d32_a8 = sk_neon::blit_mask_d32_a8; - color_cube_filter_span = neon::color_cube_filter_span; + color_cube_filter_span = sk_neon::color_cube_filter_span; } } diff --git a/src/opts/SkOpts_sse41.cpp b/src/opts/SkOpts_sse41.cpp index 938b2f9e83..bbb77e3b8d 100644 --- a/src/opts/SkOpts_sse41.cpp +++ b/src/opts/SkOpts_sse41.cpp @@ -7,13 +7,13 @@ #include "SkOpts.h" -#define SK_OPTS_NS sse41 +#define SK_OPTS_NS sk_sse41 #include "SkBlurImageFilter_opts.h" namespace SkOpts { void Init_sse41() { - box_blur_xx = sse41::box_blur_xx; - box_blur_xy = sse41::box_blur_xy; - box_blur_yx = sse41::box_blur_yx; + box_blur_xx = sk_sse41::box_blur_xx; + box_blur_xy = sk_sse41::box_blur_xy; + box_blur_yx = sk_sse41::box_blur_yx; } } diff --git a/src/opts/SkOpts_ssse3.cpp b/src/opts/SkOpts_ssse3.cpp index c65f0cbb7f..35f74e143b 100644 --- a/src/opts/SkOpts_ssse3.cpp +++ b/src/opts/SkOpts_ssse3.cpp @@ -6,7 +6,7 @@ */ #include "SkOpts.h" -#define SK_OPTS_NS ssse3 +#define SK_OPTS_NS sk_ssse3 #include "SkBlitMask_opts.h" #include "SkColorCubeFilter_opts.h" #include "SkXfermode_opts.h" @@ -14,7 +14,7 @@ namespace SkOpts { void Init_ssse3() { create_xfermode = SkCreate4pxXfermode; - blit_mask_d32_a8 = ssse3::blit_mask_d32_a8; - color_cube_filter_span = ssse3::color_cube_filter_span; + blit_mask_d32_a8 = sk_ssse3::blit_mask_d32_a8; + color_cube_filter_span = sk_ssse3::color_cube_filter_span; } } |