fold SK_CPU_HAS_CONDITION_INSTR through as always defined

src/core/SkBitmapProcState_matrixProcs.cpp

 /* NEON optimized code (C) COPYRIGHT 2009 Motorola
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapProcState.h"
 #include "SkPerspIter.h"
 #include "SkShader.h"
 #include "SkUtils.h"
@@ skipping 94 matching lines @@
 #define PREAMBLE_ARG_X          , tileProcX, tileLowBitsProcX
 #define PREAMBLE_ARG_Y          , tileProcY, tileLowBitsProcY
 #define TILEX_PROCF(fx, max)    SK_USHIFT16(tileProcX(fx) * ((max) + 1))
 #define TILEY_PROCF(fy, max)    SK_USHIFT16(tileProcY(fy) * ((max) + 1))
 #define TILEX_LOW_BITS(fx, max) tileLowBitsProcX(fx, (max) + 1)
 #define TILEY_LOW_BITS(fy, max) tileLowBitsProcY(fy, (max) + 1)
 #include "SkBitmapProcState_matrix.h"
 
 static inline U16CPU fixed_clamp(SkFixed x)
 {
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
-    if (x < 0)
+    if (x < 0) {
         x = 0;
-    if (x >> 16)
+    }
+    if (x >> 16) {
         x = 0xFFFF;
-#else
-    if (x >> 16)
-    {
-#if 0   // is this faster?
-        x = (~x >> 31) & 0xFFFF;
-#else
-        if (x < 0)
-            x = 0;
-        else
-            x = 0xFFFF;
-#endif
     }
-#endif
     return x;
 }
 
 static inline U16CPU fixed_repeat(SkFixed x)
 {
     return x & 0xFFFF;
 }
 
 // Visual Studio 2010 (MSC_VER=1600) optimizes bit-shift code incorrectly.
 // See http://code.google.com/p/skia/issues/detail?id=472
@@ skipping 35 matching lines @@
         return fixed_clamp_lowbits;
     } else {
         SkASSERT(SkShader::kMirror_TileMode == m ||
                  SkShader::kRepeat_TileMode == m);
         // mirror and repeat have the same behavior for the low bits.
         return fixed_repeat_or_mirrow_lowbits;
     }
 }
 
 static inline U16CPU int_clamp(int x, int n) {
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
-    if (x >= n)
+    if (x >= n) {
         x = n - 1;
-    if (x < 0)
+    }
+    if (x < 0) {
         x = 0;
-#else
-    if ((unsigned)x >= (unsigned)n) {
-        if (x < 0) {
-            x = 0;
-        } else {
-            x = n - 1;
-        }
     }
-#endif
     return x;
 }
 
 static inline U16CPU int_repeat(int x, int n) {
     return sk_int_mod(x, n);
 }
 
 static inline U16CPU int_mirror(int x, int n) {
     x = sk_int_mod(x, 2 * n);
     if (x >= n) {
@@ skipping 300 matching lines @@
     {
         return SK_ARM_NEON_WRAP(RepeatX_RepeatY_Procs)[index];
     }
 
     fTileProcX = choose_tile_proc(fTileModeX);
     fTileProcY = choose_tile_proc(fTileModeY);
     fTileLowBitsProcX = choose_tile_lowbits_proc(fTileModeX);
     fTileLowBitsProcY = choose_tile_lowbits_proc(fTileModeY);
     return GeneralXY_Procs[index];
 }