Update 4-at-a-time APIs.

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"
 
 // Used to prevent the compiler from optimizing away the whole loop.
 volatile uint32_t blackhole = 0;
 
 // Not a great random number generator, but it's very fast.
 // The code we're measuring is quite fast, so low overhead is essential.
 static uint32_t lcg_rand(uint32_t* seed) {
     *seed *= 1664525;
@@ skipping 31 matching lines @@
             }
         #else
             // But it's a lot faster not to, and this code won't really mind the non-PM colors.
             (void)lcg_rand(&seed);
             colors[0] = seed + 0;
             colors[1] = seed + 1;
             colors[2] = seed + 2;
             colors[3] = seed + 3;
         #endif
 
-            SkPMFloat floats[4];
+            SkPMFloat fa,fb,fc,fd;
             if (kWide) {
-                SkPMFloat::From4PMColors(floats, colors);
+                SkPMFloat::From4PMColors(colors, &fa, &fb, &fc, &fd);
             } else {
-                for (int i = 0; i < 4; i++) {
-                    floats[i] = SkPMFloat::FromPMColor(colors[i]);
-                }
+                fa = SkPMFloat::FromPMColor(colors[0]);
+                fb = SkPMFloat::FromPMColor(colors[1]);
+                fc = SkPMFloat::FromPMColor(colors[2]);
+                fd = SkPMFloat::FromPMColor(colors[3]);
             }
 
             SkPMColor back[4];
             switch (kClamp << 1 | kWide) {
-                case 0: for (int i = 0; i < 4; i++) { back[i] = floats[i].get(); }     break;
-                case 1: SkPMFloat::To4PMColors(back, floats);                          break;
-                case 2: for (int i = 0; i < 4; i++) { back[i] = floats[i].clamped(); } break;
-                case 3: SkPMFloat::ClampTo4PMColors(back, floats);                     break;
+                case 0: {
+                    back[0] = fa.get();
+                    back[1] = fb.get();
+                    back[2] = fc.get();
+                    back[3] = fd.get();
+                } break;
+                case 1: SkPMFloat::To4PMColors(fa, fb, fc, fd, back); break;
+                case 2: {
+                    back[0] = fa.clamped();
+                    back[1] = fb.clamped();
+                    back[2] = fc.clamped();
+                    back[3] = fd.clamped();
+                } break;
+                case 3: SkPMFloat::ClampTo4PMColors(fa, fb, fc, fd, back); break;
             }
             for (int i = 0; i < 4; i++) {
                 junk ^= back[i];
             }
         }
         blackhole ^= junk;
     }
 };
 
 // Extra () help DEF_BENCH not get confused by the comma inside the <>.
 DEF_BENCH(return (new PMFloatBench< true,  true>);)
 DEF_BENCH(return (new PMFloatBench<false,  true>);)
 DEF_BENCH(return (new PMFloatBench< true, false>);)
 DEF_BENCH(return (new PMFloatBench<false, false>);)