Port to real Sk2f.

tests/Sk4xTest.cpp

 #include "Test.h"
 #include "Sk4x.h"
 
 #define ASSERT_EQ(a, b) REPORTER_ASSERT(r, a.equal(b).allTrue())
 #define ASSERT_NE(a, b) REPORTER_ASSERT(r, a.notEqual(b).allTrue())
 
 DEF_TEST(Sk4x_Construction, r) {
     Sk4f uninitialized;
     Sk4f zero(0,0,0,0);
     Sk4f foo(1,2,3,4),
@@ skipping 24 matching lines @@
     foo = Sk4f::Load(fs+1);
     ASSERT_NE(foo, bar);
 
     foo.storeAligned(fs);
     bar.store(fs+1);
     REPORTER_ASSERT(r, fs[0] == 6 &&
                        fs[1] == 5 &&
                        fs[2] == 6 &&
                        fs[3] == 7 &&
                        fs[4] == 8);
-
-    // Load2 and store2().
-    float two[2] = { 1.0f, 2.0f };
-    Sk4f twoIn4f = Sk4f::Load2(two);
-    twoIn4f = twoIn4f.multiply(Sk4f(2.0f));
-    twoIn4f.store2(two);
-
-    REPORTER_ASSERT(r, two[0] == 2.0f);
-    REPORTER_ASSERT(r, two[1] == 4.0f);
 }
 
 DEF_TEST(Sk4x_Conversions, r) {
     // Assuming IEEE floats.
     Sk4f zerof(0,0,0,0);
     Sk4i zeroi(0,0,0,0);
     ASSERT_EQ(zeroi, zerof.cast<Sk4i>());
     ASSERT_EQ(zeroi, zerof.reinterpret<Sk4i>());
     ASSERT_EQ(zerof, zeroi.cast<Sk4f>());
     ASSERT_EQ(zerof, zeroi.reinterpret<Sk4f>());
@@ skipping 75 matching lines @@
 }
 
 DEF_TEST(Sk4x_Swizzle, r) {
     ASSERT_EQ(Sk4f(3,4,1,2), Sk4f(1,2,3,4).zwxy());
     ASSERT_EQ(Sk4f(1,2,5,6), Sk4f::XYAB(Sk4f(1,2,3,4), Sk4f(5,6,7,8)));
     ASSERT_EQ(Sk4f(3,4,7,8), Sk4f::ZWCD(Sk4f(1,2,3,4), Sk4f(5,6,7,8)));
     ASSERT_EQ(Sk4i(3,4,1,2), Sk4i(1,2,3,4).zwxy());
     ASSERT_EQ(Sk4i(1,2,5,6), Sk4i::XYAB(Sk4i(1,2,3,4), Sk4i(5,6,7,8)));
     ASSERT_EQ(Sk4i(3,4,7,8), Sk4i::ZWCD(Sk4i(1,2,3,4), Sk4i(5,6,7,8)));
 }