From e5a196f4403529076dfa335facb2122c5768d8aa Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 27 Jul 2012 13:08:36 +0000 Subject: [PATCH] use SK_RESTRICT instead of __restrict__ git-svn-id: http://skia.googlecode.com/svn/trunk@4801 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/opts/SkBlitRow_opts_SSE2.cpp | 10 +++++----- src/opts/SkBlitRow_opts_SSE2.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/opts/SkBlitRow_opts_SSE2.cpp b/src/opts/SkBlitRow_opts_SSE2.cpp index 7149433..f61617a 100644 --- a/src/opts/SkBlitRow_opts_SSE2.cpp +++ b/src/opts/SkBlitRow_opts_SSE2.cpp @@ -1006,7 +1006,7 @@ void S32A_D565_Opaque_SSE2(uint16_t* SK_RESTRICT dst, * portable version is in core/SkBlitRow_D16.cpp */ -void S32A_D565_Opaque_Dither_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32A_D565_Opaque_Dither_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y) { @@ -1164,7 +1164,7 @@ void S32A_D565_Opaque_Dither_SSE2(uint16_t* __restrict__ dst, const SkPMColor* _ * portable version is in core/SkBlitRow_D16.cpp */ -void S32_D565_Opaque_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Opaque_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y) { @@ -1224,7 +1224,7 @@ void S32_D565_Opaque_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restric * portable version is in core/SkBlitRow_D16.cpp */ -void S32_D565_Blend_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Blend_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y) { @@ -1314,7 +1314,7 @@ void S32_D565_Blend_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict * portable version is in core/SkBlitRow_D16.cpp */ -void S32_D565_Opaque_Dither_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Opaque_Dither_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y) { #ifdef ENABLE_DITHER_MATRIX_4X4 @@ -1418,7 +1418,7 @@ void S32_D565_Opaque_Dither_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __ * portable version is in core/SkBlitRow_D16.cpp */ -void S32_D565_Blend_Dither_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Blend_Dither_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y) { #ifdef ENABLE_DITHER_MATRIX_4X4 diff --git a/src/opts/SkBlitRow_opts_SSE2.h b/src/opts/SkBlitRow_opts_SSE2.h index 79677bd..05f3893 100644 --- a/src/opts/SkBlitRow_opts_SSE2.h +++ b/src/opts/SkBlitRow_opts_SSE2.h @@ -41,14 +41,14 @@ void S32A_D565_Opaque_Dither_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, U8CPU alpha, int x, int y); -void S32_D565_Opaque_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Opaque_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y); -void S32_D565_Blend_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Blend_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y); -void S32_D565_Opaque_Dither_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Opaque_Dither_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y); -void S32_D565_Blend_Dither_SSE2(uint16_t* __restrict__ dst, const SkPMColor* __restrict__ src,int count, +void S32_D565_Blend_Dither_SSE2(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,int count, U8CPU alpha, int x, int y); -- 2.7.4