SkPx: use namespaces as namespaces

src/opts/SkPx_neon.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPx_neon_DEFINED
 #define SkPx_neon_DEFINED
 
 // When we have NEON, we like to work 8 pixels at a time.
 // This lets us exploit vld4/vst4 and represent SkPx as planar uint8x8x4_t,
 // Wide as planar uint16x8x4_t, and Alpha as a single uint8x8_t plane.
 
-struct SkPx_neon {
+namespace neon {
+
+struct SkPx {
     static const int N = 8;
 
     uint8x8x4_t fVec;
-    SkPx_neon(uint8x8x4_t vec) : fVec(vec) {}
+    SkPx(uint8x8x4_t vec) : fVec(vec) {}
 
-    static SkPx_neon Dup(uint32_t px) { return vld4_dup_u8((const uint8_t*)&px); }
-    static SkPx_neon Load(const uint32_t* px) { return vld4_u8((const uint8_t*)px); }
-    static SkPx_neon Load(const uint32_t* px, int n) {
+    static SkPx Dup(uint32_t px) { return vld4_dup_u8((const uint8_t*)&px); }
+    static SkPx Load(const uint32_t* px) { return vld4_u8((const uint8_t*)px); }
+    static SkPx Load(const uint32_t* px, int n) {
         SkASSERT(0 < n && n < 8);
         uint8x8x4_t v = vld4_dup_u8((const uint8_t*)px);  // n>=1, so start all lanes with pixel 0.
         switch (n) {
             case 7: v = vld4_lane_u8((const uint8_t*)(px+6), v, 6);  // fall through
             case 6: v = vld4_lane_u8((const uint8_t*)(px+5), v, 5);  // fall through
             case 5: v = vld4_lane_u8((const uint8_t*)(px+4), v, 4);  // fall through
             case 4: v = vld4_lane_u8((const uint8_t*)(px+3), v, 3);  // fall through
             case 3: v = vld4_lane_u8((const uint8_t*)(px+2), v, 2);  // fall through
             case 2: v = vld4_lane_u8((const uint8_t*)(px+1), v, 1);
         }
@@ skipping 67 matching lines @@
         }
         template <int bits> Wide shr() const {
             return (uint16x8x4_t) {{
                 vshrq_n_u16(fVec.val[0], bits),
                 vshrq_n_u16(fVec.val[1], bits),
                 vshrq_n_u16(fVec.val[2], bits),
                 vshrq_n_u16(fVec.val[3], bits),
             }};
         }
 
-        SkPx_neon addNarrowHi(const SkPx_neon& o) const {
+        SkPx addNarrowHi(const SkPx& o) const {
             return (uint8x8x4_t) {{
                 vshrn_n_u16(vaddw_u8(fVec.val[0], o.fVec.val[0]), 8),
                 vshrn_n_u16(vaddw_u8(fVec.val[1], o.fVec.val[1]), 8),
                 vshrn_n_u16(vaddw_u8(fVec.val[2], o.fVec.val[2]), 8),
                 vshrn_n_u16(vaddw_u8(fVec.val[3], o.fVec.val[3]), 8),
             }};
         }
     };
 
     Alpha alpha() const { return fVec.val[3]; }
 
     Wide widenLo() const {
         return (uint16x8x4_t) {{
             vmovl_u8(fVec.val[0]),
             vmovl_u8(fVec.val[1]),
             vmovl_u8(fVec.val[2]),
             vmovl_u8(fVec.val[3]),
         }};
     }
     // TODO: these two can probably be done faster.
     Wide widenHi() const { return this->widenLo().shl<8>(); }
     Wide widenLoHi() const { return this->widenLo() + this->widenHi(); }
 
-    SkPx_neon operator+(const SkPx_neon& o) const {
+    SkPx operator+(const SkPx& o) const {
         return (uint8x8x4_t) {{
             vadd_u8(fVec.val[0], o.fVec.val[0]),
             vadd_u8(fVec.val[1], o.fVec.val[1]),
             vadd_u8(fVec.val[2], o.fVec.val[2]),
             vadd_u8(fVec.val[3], o.fVec.val[3]),
         }};
     }
-    SkPx_neon operator-(const SkPx_neon& o) const {
+    SkPx operator-(const SkPx& o) const {
         return (uint8x8x4_t) {{
             vsub_u8(fVec.val[0], o.fVec.val[0]),
             vsub_u8(fVec.val[1], o.fVec.val[1]),
             vsub_u8(fVec.val[2], o.fVec.val[2]),
             vsub_u8(fVec.val[3], o.fVec.val[3]),
         }};
     }
-    SkPx_neon saturatedAdd(const SkPx_neon& o) const {
+    SkPx saturatedAdd(const SkPx& o) const {
         return (uint8x8x4_t) {{
             vqadd_u8(fVec.val[0], o.fVec.val[0]),
             vqadd_u8(fVec.val[1], o.fVec.val[1]),
             vqadd_u8(fVec.val[2], o.fVec.val[2]),
             vqadd_u8(fVec.val[3], o.fVec.val[3]),
         }};
     }
 
     Wide operator*(const Alpha& a) const {
         return (uint16x8x4_t) {{
             vmull_u8(fVec.val[0], a.fA),
             vmull_u8(fVec.val[1], a.fA),
             vmull_u8(fVec.val[2], a.fA),
             vmull_u8(fVec.val[3], a.fA),
         }};
     }
-    SkPx_neon approxMulDiv255(const Alpha& a) const {
+    SkPx approxMulDiv255(const Alpha& a) const {
         return (*this * a).addNarrowHi(*this);
     }
 
-    SkPx_neon addAlpha(const Alpha& a) const {
+    SkPx addAlpha(const Alpha& a) const {
         return (uint8x8x4_t) {{
             fVec.val[0],
             fVec.val[1],
             fVec.val[2],
             vadd_u8(fVec.val[3], a.fA),
         }};
     }
 };
-typedef SkPx_neon SkPx;
+
+}  // namespace neon
+
+typedef neon::SkPx SkPx;
 
 #endif//SkPx_neon_DEFINED