Refactor Sk2x<T> + Sk4x<T> into SkNf<N,T> and SkNi<N,T>

bench/PMFloatBench.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 "Benchmark.h"
 #include "SkPMFloat.h"
 
@@ skipping 85 matching lines @@
 DEF_BENCH(return (new PMFloatGetSetBench<false,  true>);)
 DEF_BENCH(return (new PMFloatGetSetBench< true, false>);)
 DEF_BENCH(return (new PMFloatGetSetBench<false, false>);)
 
 struct PMFloatGradientBench : public Benchmark {
     const char* onGetName() override { return "PMFloat_gradient"; }
     bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; }
 
     SkPMColor fDevice[100];
     void onDraw(const int loops, SkCanvas*) override {
-        Sk4f c0 = SkPMFloat::FromARGB(255, 255, 0, 0),
+        Sk4s c0 = SkPMFloat::FromARGB(255, 255, 0, 0),
              c1 = SkPMFloat::FromARGB(255, 0, 0, 255),
              dc = c1 - c0,
              fx(0.1f),
              dx(0.002f),
              dcdx(dc*dx),
              dcdx4(dcdx+dcdx+dcdx+dcdx);
 
         for (int n = 0; n < loops; n++) {
-            Sk4f a = c0 + dc*fx + Sk4f(0.5f),  // The +0.5f lets us call trunc() instead of get().
+            Sk4s a = c0 + dc*fx + Sk4s(0.5f),  // The +0.5f lets us call trunc() instead of get().
                  b = a + dcdx,
                  c = b + dcdx,
                  d = c + dcdx;
             for (size_t i = 0; i < SK_ARRAY_COUNT(fDevice); i += 4) {
                 fDevice[i+0] = SkPMFloat(a).trunc();
                 fDevice[i+1] = SkPMFloat(b).trunc();
                 fDevice[i+2] = SkPMFloat(c).trunc();
                 fDevice[i+3] = SkPMFloat(d).trunc();
                 a += dcdx4;
                 b += dcdx4;
                 c += dcdx4;
                 d += dcdx4;
             }
         }
     }
 };
 
 DEF_BENCH(return new PMFloatGradientBench;)