move reinterpret_cast into SK_PREFETCH

no public API changes
TBR=reed@google.com

BUG=skia:

Review URL: https://codereview.chromium.org/1419573011

diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
index 76f504f..0482a70 100644 (file)
--- a/include/core/SkPostConfig.h
+++ b/include/core/SkPostConfig.h
@@ -296,8 +296,8 @@
 //////////////////////////////////////////////////////////////////////
 
 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
-    #define SK_PREFETCH(ptr)       _mm_prefetch(ptr, _MM_HINT_T0)
-    #define SK_WRITE_PREFETCH(ptr) _mm_prefetch(ptr, _MM_HINT_T0)
+    #define SK_PREFETCH(ptr)       _mm_prefetch(reinterpret_cast<const char*>(ptr), _MM_HINT_T0)
+    #define SK_WRITE_PREFETCH(ptr) _mm_prefetch(reinterpret_cast<const char*>(ptr), _MM_HINT_T0)
 #elif defined(__GNUC__)
     #define SK_PREFETCH(ptr)       __builtin_prefetch(ptr)
     #define SK_WRITE_PREFETCH(ptr) __builtin_prefetch(ptr, 1)

diff --git a/src/opts/SkBlurImageFilter_opts.h b/src/opts/SkBlurImageFilter_opts.h
index 7844e9f..5633e2e 100644 (file)
--- a/src/opts/SkBlurImageFilter_opts.h
+++ b/src/opts/SkBlurImageFilter_opts.h
@@ -209,7 +209,7 @@ static void box_blur(const SkPMColor* src, int srcStride, SkPMColor* dst, int ke
             }
             sptr += srcStrideX;
             if (srcDirection == BlurDirection::kY) {
-                SK_PREFETCH(reinterpret_cast<const char*>(sptr + (rightOffset + 1) * srcStrideX));
+                SK_PREFETCH(sptr + (rightOffset + 1) * srcStrideX);
             }
             dptr += dstStrideX;
         }