From 64d8be00b85c398a757126ed9767ff57e646a1d5 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 7 Dec 2016 21:36:49 -0500 Subject: [PATCH] Make sure all the convolve functions are defined. CQ_INCLUDE_TRYBOTS=skia.primary:Build-Ubuntu-GCC-x86_64-Release-Fast,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD Change-Id: I5ae1fdee957f796d8051bbb0eca9e037aef9b2c9 Reviewed-on: https://skia-review.googlesource.com/5655 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- src/opts/SkBitmapFilter_opts.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/opts/SkBitmapFilter_opts.h b/src/opts/SkBitmapFilter_opts.h index 9238f419af..b6199cb1e9 100644 --- a/src/opts/SkBitmapFilter_opts.h +++ b/src/opts/SkBitmapFilter_opts.h @@ -121,8 +121,9 @@ namespace SK_OPTS_NS { } } } +#endif -#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 +#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 static SK_ALWAYS_INLINE void AccumRemainder(const unsigned char* pixelsLeft, const SkConvolutionFilter1D::ConvolutionFixed* filterValues, __m128i& accum, int r) { @@ -335,6 +336,8 @@ namespace SK_OPTS_NS { } } +// If we've got AVX2, we've already defined a faster ConvolveVertically above. +#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX2 // Does vertical convolution to produce one output row. The filter values and // length are given in the first two parameters. These are applied to each // of the rows pointed to in the |sourceDataRows| array, with each row @@ -505,6 +508,7 @@ namespace SK_OPTS_NS { } } } +#endif//SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX2 #elif defined(SK_ARM_HAS_NEON)