Commit 9c6ce43d authored by Johann's avatar Johann
Browse files

Add some indirection to the quantize test

Visual Studio and XCode require the address of the functions be passed.

Change-Id: Id39cab8e50061fdc6ac6018371a3a158c713e14b
parent 1e753387
......@@ -213,36 +213,37 @@ TEST_P(QuantizeTestPair, TestMultipleQ) {
INSTANTIATE_TEST_CASE_P(
SSE2, QuantizeTest,
::testing::Values(
make_tuple(vp8_fast_quantize_b_sse2, vp8_fast_quantize_b_c),
make_tuple(vp8_regular_quantize_b_sse2, vp8_regular_quantize_b_c)));
make_tuple(&vp8_fast_quantize_b_sse2, &vp8_fast_quantize_b_c),
make_tuple(&vp8_regular_quantize_b_sse2, &vp8_regular_quantize_b_c)));
#endif // HAVE_SSE2
#if HAVE_SSSE3
INSTANTIATE_TEST_CASE_P(SSSE3, QuantizeTest,
::testing::Values(make_tuple(vp8_fast_quantize_b_ssse3,
vp8_fast_quantize_b_c)));
::testing::Values(make_tuple(&vp8_fast_quantize_b_ssse3,
&vp8_fast_quantize_b_c)));
#endif // HAVE_SSSE3
#if HAVE_SSE4_1
INSTANTIATE_TEST_CASE_P(SSE4_1, QuantizeTest, ::testing::Values(make_tuple(
vp8_regular_quantize_b_sse4_1,
vp8_regular_quantize_b_c)));
INSTANTIATE_TEST_CASE_P(
SSE4_1, QuantizeTest,
::testing::Values(make_tuple(&vp8_regular_quantize_b_sse4_1,
&vp8_regular_quantize_b_c)));
#endif // HAVE_SSE4_1
#if HAVE_MEDIA
INSTANTIATE_TEST_CASE_P(MEDIA, QuantizeTest,
::testing::Values(make_tuple(vp8_fast_quantize_b_armv6,
vp8_fast_quantize_b_c)));
::testing::Values(make_tuple(&vp8_fast_quantize_b_armv6,
&vp8_fast_quantize_b_c)));
#endif // HAVE_MEDIA
#if HAVE_NEON_ASM
INSTANTIATE_TEST_CASE_P(NEON, QuantizeTest,
::testing::Values(make_tuple(vp8_fast_quantize_b_neon,
vp8_fast_quantize_b_c)));
::testing::Values(make_tuple(&vp8_fast_quantize_b_neon,
&vp8_fast_quantize_b_c)));
INSTANTIATE_TEST_CASE_P(
NEON, QuantizeTestPair,
::testing::Values(make_tuple(vp8_fast_quantize_b_pair_neon,
vp8_fast_quantize_b_pair_c)));
::testing::Values(make_tuple(&vp8_fast_quantize_b_pair_neon,
&vp8_fast_quantize_b_pair_c)));
#endif // HAVE_NEON_ASM
} // namespace
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment