Port SkBlurImage opts to SkOpts.

src/core/SkOpts.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkOnce.h"
 #include "SkOpts.h"
+#define SK_OPTS_NS portable

[djsollen, 2015/08/04 14:39:56]

given that you don't yet use this define I would remove it from this CL

[mtklein, 2015/08/04 14:46:44]

Let's leave it.  It's what it wants to be, modulo me figuring out why I can't
make it work in SkXfermode_opt.h.

 #include "SkXfermode_opts.h"
 
 #if defined(SK_CPU_X86)
     #if defined(SK_BUILD_FOR_WIN32)
         #include <intrin.h>
         static void cpuid(uint32_t abcd[4]) { __cpuid((int*)abcd, 1); }
     #else
         #include <cpuid.h>
         static void cpuid(uint32_t abcd[4]) { __get_cpuid(1, abcd+0, abcd+1, abcd+2, abcd+3); }
     #endif
@@ skipping 20 matching lines @@
 
 }  // namespace portable
 
 namespace SkOpts {
     // Define default function pointer values here...
     decltype(rsqrt)                     rsqrt = portable::rsqrt;
     decltype(memset16)               memset16 = portable::memsetT<uint16_t>;
     decltype(memset32)               memset32 = portable::memsetT<uint32_t>;
     decltype(create_xfermode) create_xfermode = SkCreate4pxXfermode;
 
+    decltype(box_blur_xx) box_blur_xx = nullptr;

[djsollen, 2015/08/04 14:39:56]

this is a break from previous versions where we default to the portable code. 
Why the switch?

[mtklein, 2015/08/04 14:46:44]

The portable blurs are in src/effects, and this keeps it that way.  We can
follow up by moving them to src/opts if you like.  I can see arguments for both
ways.

[djsollen, 2015/08/04 14:56:17]

I like the idea that SkOpts functions are always defined and you don't need to
do these null checks, but I'm ok to put that off to a follow up CL.

[mtklein_C, 2015/08/04 15:16:56]

I tried it and I'm convinced.  Done!

+    decltype(box_blur_xy) box_blur_xy = nullptr;
+    decltype(box_blur_yx) box_blur_yx = nullptr;
+
     // Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.
     void Init_sse2();
     void Init_ssse3();
     void Init_sse41();
     void Init_neon();
     //TODO: _dsp2, _armv7, _armv8, _x86, _x86_64, _sse42, _avx, avx2, ... ?
 
     static void init() {
         // TODO: Chrome's not linking _sse* opts on iOS simulator builds.  Bug or feature?
     #if defined(SK_CPU_X86) && !defined(SK_BUILD_FOR_IOS)
@@ skipping 11 matching lines @@
 
     SK_DECLARE_STATIC_ONCE(gInitOnce);
     void Init() { SkOnce(&gInitOnce, init); }
 
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
     static struct AutoInit {
         AutoInit() { Init(); }
     } gAutoInit;
 #endif
 }