Patches on top of Radu's latest.

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
 #include "SkBlitMask_opts.h"
 #include "SkBlurImageFilter_opts.h"
+#include "SkColorCubeFilter_opts.h"
 #include "SkFloatingPoint_opts.h"
 #include "SkMorphologyImageFilter_opts.h"
 #include "SkTextureCompressor_opts.h"
 #include "SkUtils_opts.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
 #elif !defined(SK_ARM_HAS_NEON) && defined(SK_CPU_ARM32) && defined(SK_BUILD_FOR_ANDROID)
     #include <cpu-features.h>
 #endif
 
 namespace SkOpts {
     // Define default function pointer values here...
     // If our global compile options are set high enough, these 'portable' defaults might
     // even be CPU-specialized, e.g. a typical x86-64 machine might start with SSE2 defaults.
     // They'll still get a chance to be replaced with even better ones, e.g. using SSE4.1.
     decltype(rsqrt)                     rsqrt = portable::rsqrt;
     decltype(memset16)               memset16 = portable::memset16;
     decltype(memset32)               memset32 = portable::memset32;
     decltype(create_xfermode) create_xfermode = SkCreate4pxXfermode;
+    decltype(color_cube_filter_span) color_cube_filter_span = portable::color_cube_filter_span;
 
     decltype(box_blur_xx) box_blur_xx = portable::box_blur_xx;
     decltype(box_blur_xy) box_blur_xy = portable::box_blur_xy;
     decltype(box_blur_yx) box_blur_yx = portable::box_blur_yx;
 
     decltype(dilate_x) dilate_x = portable::dilate_x;
     decltype(dilate_y) dilate_y = portable::dilate_y;
     decltype( erode_x)  erode_x = portable::erode_x;
     decltype( erode_y)  erode_y = portable::erode_y;
 
@@ skipping 22 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
 }