AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure all the convolve functions are defined.

Browse Source 
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 <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2016-12-07 21:36:49 -05:00 committed by Skia Commit-Bot
parent 019be7b472
commit 64d8be00b8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opts/SkBitmapFilter_opts.h
View File

@ -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, static SK_ALWAYS_INLINE void AccumRemainder(const unsigned char* pixelsLeft,
const SkConvolutionFilter1D::ConvolutionFixed* filterValues, __m128i& accum, int r) { 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 // 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 // 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 // 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) #elif defined(SK_ARM_HAS_NEON)