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

src/core/SkRect.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRect.h"
 
@@ skipping 27 matching lines @@
 
 void SkRect::toQuad(SkPoint quad[4]) const {
     SkASSERT(quad);
 
     quad[0].set(fLeft, fTop);
     quad[1].set(fRight, fTop);
     quad[2].set(fRight, fBottom);
     quad[3].set(fLeft, fBottom);
 }
 
-//#include "Sk2x.h"
-#include "Sk4x.h"
+#include "SkNx.h"
 
-static inline bool is_finite(const Sk4f& value) {
-    Sk4i finite = value * Sk4f(0) == Sk4f(0);
+static inline bool is_finite(const Sk4s& value) {
+    Sk4i finite = value * Sk4s(0) == Sk4s(0);
     return finite.allTrue();
 }
 
 bool SkRect::setBoundsCheck(const SkPoint pts[], int count) {
     SkASSERT((pts && count > 0) || count == 0);
 
     bool isFinite = true;
 
     if (count <= 0) {
         sk_bzero(this, sizeof(SkRect));
     } else {
-        Sk4f min, max, accum;
+        Sk4s min, max, accum;
 
         if (count & 1) {
-            min = Sk4f(pts[0].fX, pts[0].fY, pts[0].fX, pts[0].fY);
+            min = Sk4s(pts[0].fX, pts[0].fY, pts[0].fX, pts[0].fY);
             pts += 1;
             count -= 1;
         } else {
-            min = Sk4f::Load(&pts[0].fX);
+            min = Sk4s::Load(&pts[0].fX);
             pts += 2;
             count -= 2;
         }
         accum = max = min;
-        accum *= Sk4f(0);
+        accum *= Sk4s(0);
 
         count >>= 1;
         for (int i = 0; i < count; ++i) {
-            Sk4f xy = Sk4f::Load(&pts->fX);
+            Sk4s xy = Sk4s::Load(&pts->fX);
             accum *= xy;
-            min = Sk4f::Min(min, xy);
-            max = Sk4f::Max(max, xy);
+            min = Sk4s::Min(min, xy);
+            max = Sk4s::Max(max, xy);
             pts += 2;
         }
 
         /**
          *  With some trickery, we may be able to use Min/Max to also propogate non-finites,
          *  in which case we could eliminate accum entirely, and just check min and max for
          *  "is_finite".
          */
         if (is_finite(accum)) {
             float minArray[4], maxArray[4];
@@ skipping 75 matching lines @@
         SkString strL, strT, strR, strB;
         SkAppendScalarDec(&strL, fLeft);
         SkAppendScalarDec(&strT, fTop);
         SkAppendScalarDec(&strR, fRight);
         SkAppendScalarDec(&strB, fBottom);
         line.printf("SkRect::MakeLTRB(%s, %s, %s, %s);",
                     strL.c_str(), strT.c_str(), strR.c_str(), strB.c_str());
     }
     SkDebugf("%s\n", line.c_str());
 }