back to Sk4f for SkPMColor

src/effects/SkColorMatrixFilter.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorMatrixFilter.h"
 #include "SkColorMatrix.h"
 #include "SkColorPriv.h"
@@ skipping 237 matching lines @@
  *
  *      new_red = old_red * alpha / 255
  *
  *  However, 1.0f/255 comes to (in hex) 0x3B808081, which is slightly bigger than the "actual"
  *  value of 0x3B808080(repeat 80)... This slightly too-big value can cause us to compute
  *  new_red > alpha, which is a problem (for valid premul). To fix this, we use a
  *  hand-computed value of 0x3B808080, 1 ULP smaller. This keeps our colors valid.
  */
 static const float gInv255 = 0.0039215683f; //  (1.0f / 255) - ULP == SkBits2Float(0x3B808080)
 
-static Sk4s premul(const Sk4s& x) {
+static Sk4f premul(const Sk4f& x) {
     float scale = SkPMFloat(x).a() * gInv255;
-    Sk4s pm = x * Sk4s(scale, scale, scale, 1);
+    Sk4f pm = x * Sk4f(scale, scale, scale, 1);
 
 #ifdef SK_DEBUG
     SkPMFloat pmf(pm);
     SkASSERT(pmf.isValid());
 #endif
 
     return pm;
 }
 
-static Sk4s unpremul(const SkPMFloat& pm) {
+static Sk4f unpremul(const SkPMFloat& pm) {
     float scale = 255 / pm.a(); // candidate for fast/approx invert?
-    return Sk4s(pm) * Sk4s(scale, scale, scale, 1);
+    return Sk4f(pm) * Sk4f(scale, scale, scale, 1);
 }
 
 static Sk4f clamp_0_255(const Sk4f& value) {
     return Sk4f::Max(Sk4f::Min(value, Sk4f(255)), Sk4f(0));
 }
 
 void SkColorMatrixFilter::filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const {
     Proc proc = fProc;
     if (NULL == proc) {
         if (src != dst) {
             memcpy(dst, src, count * sizeof(SkPMColor));
         }
         return;
     }
 
 #ifdef SK_SUPPORT_LEGACY_INT_COLORMATRIX
     const bool use_floats = false;
 #else
     const bool use_floats = true;
 #endif
 
     if (use_floats) {
-        const Sk4s c0 = Sk4s::Load(fTranspose + 0);
-        const Sk4s c1 = Sk4s::Load(fTranspose + 4);
-        const Sk4s c2 = Sk4s::Load(fTranspose + 8);
-        const Sk4s c3 = Sk4s::Load(fTranspose + 12);
-        const Sk4s c4 = Sk4s::Load(fTranspose + 16);  // translates
+        const Sk4f c0 = Sk4f::Load(fTranspose + 0);
+        const Sk4f c1 = Sk4f::Load(fTranspose + 4);
+        const Sk4f c2 = Sk4f::Load(fTranspose + 8);
+        const Sk4f c3 = Sk4f::Load(fTranspose + 12);
+        const Sk4f c4 = Sk4f::Load(fTranspose + 16);  // translates
 
         // todo: we could cache this in the constructor...
         SkPMColor matrix_translate_pmcolor = SkPMFloat(premul(clamp_0_255(c4))).clamped();
 
         for (int i = 0; i < count; i++) {
             const SkPMColor src_c = src[i];
             if (0 == src_c) {
                 dst[i] = matrix_translate_pmcolor;
                 continue;
             }
 
             SkPMFloat srcf(src_c);
 
             if (0xFF != SkGetPackedA32(src_c)) {
                 srcf = unpremul(srcf);
             }
 
-            Sk4s r4 = Sk4s(srcf.r());
-            Sk4s g4 = Sk4s(srcf.g());
-            Sk4s b4 = Sk4s(srcf.b());
-            Sk4s a4 = Sk4s(srcf.a());
+            Sk4f r4 = Sk4f(srcf.r());
+            Sk4f g4 = Sk4f(srcf.g());
+            Sk4f b4 = Sk4f(srcf.b());
+            Sk4f a4 = Sk4f(srcf.a());
 
             // apply matrix
-            Sk4s dst4 = c0 * r4 + c1 * g4 + c2 * b4 + c3 * a4 + c4;
+            Sk4f dst4 = c0 * r4 + c1 * g4 + c2 * b4 + c3 * a4 + c4;
 
             // clamp, re-premul, and write
             dst[i] = SkPMFloat(premul(clamp_0_255(dst4))).get();
         }
     } else {
         const State& state = fState;
         int32_t result[4];
         const SkUnPreMultiply::Scale* table = SkUnPreMultiply::GetScaleTable();
 
         for (int i = 0; i < count; i++) {
@@ skipping 243 matching lines @@
     str->append("matrix: (");
     for (int i = 0; i < 20; ++i) {
         str->appendScalar(fMatrix.fMat[i]);
         if (i < 19) {
             str->append(", ");
         }
     }
     str->append(")");
 }
 #endif