| Index: src/opts/opts_check_x86.cpp
|
| diff --git a/src/opts/opts_check_x86.cpp b/src/opts/opts_check_x86.cpp
|
| index 2e140e8df61f40e7b596c00eff5b43e39b07be9e..d3450c1dfc5394237bfcc1730d5cda77275ba5d5 100644
|
| --- a/src/opts/opts_check_x86.cpp
|
| +++ b/src/opts/opts_check_x86.cpp
|
| @@ -190,26 +190,26 @@ void SkBitmapProcState::platformProcs() {
|
|
|
| static const SkBlitRow::Proc16 platform_16_procs[] = {
|
| S32_D565_Opaque_SSE2, // S32_D565_Opaque
|
| - NULL, // S32_D565_Blend
|
| + nullptr, // S32_D565_Blend
|
| S32A_D565_Opaque_SSE2, // S32A_D565_Opaque
|
| - NULL, // S32A_D565_Blend
|
| + nullptr, // S32A_D565_Blend
|
| S32_D565_Opaque_Dither_SSE2, // S32_D565_Opaque_Dither
|
| - NULL, // S32_D565_Blend_Dither
|
| + nullptr, // S32_D565_Blend_Dither
|
| S32A_D565_Opaque_Dither_SSE2, // S32A_D565_Opaque_Dither
|
| - NULL, // S32A_D565_Blend_Dither
|
| + nullptr, // S32A_D565_Blend_Dither
|
| };
|
|
|
| SkBlitRow::Proc16 SkBlitRow::PlatformFactory565(unsigned flags) {
|
| if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
|
| return platform_16_procs[flags];
|
| } else {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| static const SkBlitRow::ColorProc16 platform_565_colorprocs_SSE2[] = {
|
| Color32A_D565_SSE2, // Color32A_D565,
|
| - NULL, // Color32A_D565_Dither
|
| + nullptr, // Color32A_D565_Dither
|
| };
|
|
|
| SkBlitRow::ColorProc16 SkBlitRow::PlatformColorFactory565(unsigned flags) {
|
| @@ -221,19 +221,19 @@ SkBlitRow::ColorProc16 SkBlitRow::PlatformColorFactory565(unsigned flags) {
|
| if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
|
| return platform_565_colorprocs_SSE2[flags];
|
| } else {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| static const SkBlitRow::Proc32 platform_32_procs_SSE2[] = {
|
| - NULL, // S32_Opaque,
|
| + nullptr, // S32_Opaque,
|
| S32_Blend_BlitRow32_SSE2, // S32_Blend,
|
| S32A_Opaque_BlitRow32_SSE2, // S32A_Opaque
|
| S32A_Blend_BlitRow32_SSE2, // S32A_Blend,
|
| };
|
|
|
| static const SkBlitRow::Proc32 platform_32_procs_SSE4[] = {
|
| - NULL, // S32_Opaque,
|
| + nullptr, // S32_Opaque,
|
| S32_Blend_BlitRow32_SSE2, // S32_Blend,
|
| S32A_Opaque_BlitRow32_SSE4, // S32A_Opaque
|
| S32A_Blend_BlitRow32_SSE2, // S32A_Blend,
|
| @@ -246,7 +246,7 @@ SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
|
| if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
|
| return platform_32_procs_SSE2[flags];
|
| } else {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -260,11 +260,11 @@ SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
|
| return SkBlitLCD16Row_SSE2;
|
| }
|
| } else {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| }
|
|
|
| SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkColorType, SkMask::Format, RowFlags) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|