From 8da5088da10240d1208a90de462b34f6032e7701 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 13 Nov 2014 10:59:54 -0800 Subject: [PATCH] Revert "Fix SSSE3 partial_idct_test detection" This reverts commit 7d07f512cd87446eef541e9af4af19b1e8c6342a. this breaks visual studio builds: '#' : invalid character : possibly the result of a macro expansion Change-Id: I77170d549afb71e75a878fa0f6acd204fe8d9e67 --- test/partial_idct_test.cc | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc index 39d5854..536273e 100644 --- a/test/partial_idct_test.cc +++ b/test/partial_idct_test.cc @@ -294,6 +294,17 @@ INSTANTIATE_TEST_CASE_P( TX_4X4, 1))); #endif +#if HAVE_SSSE3 && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH && \ + !CONFIG_EMULATE_HARDWARE +INSTANTIATE_TEST_CASE_P( + SSSE3_64, PartialIDctTest, + ::testing::Values( + make_tuple(&vp9_fdct8x8_c, + &vp9_idct8x8_64_add_c, + &vp9_idct8x8_12_add_ssse3, + TX_8X8, 12))); +#endif + #if HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE INSTANTIATE_TEST_CASE_P( SSSE3, PartialIDctTest, @@ -301,14 +312,6 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vp9_fdct16x16_c, &vp9_idct16x16_256_add_c, &vp9_idct16x16_10_add_ssse3, - TX_16X16, 10) -#if ARCH_X86_64 - , - make_tuple(&vp9_fdct8x8_c, - &vp9_idct8x8_64_add_c, - &vp9_idct8x8_12_add_ssse3, - TX_8X8, 12) -#endif // ARCH_X86_64 - )); -#endif // HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE + TX_16X16, 10))); +#endif } // namespace -- 2.7.4