From 1c967f17bd9c70da6c7d773aef466703e463d2a7 Mon Sep 17 00:00:00 2001 From: Johann Date: Mon, 29 Jun 2015 17:04:58 -0700 Subject: [PATCH] Fix --disable-use-x86inc when used with --enable-vp9-highbitdepth Change-Id: I0ed6de72dc0bb99fc9c5b1f6500399b16754ffb3 --- test/vp9_intrapred_test.cc | 9 ++++++--- vp9/common/vp9_rtcd_defs.pl | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/vp9_intrapred_test.cc b/test/vp9_intrapred_test.cc index 75d55d0..9533750 100644 --- a/test/vp9_intrapred_test.cc +++ b/test/vp9_intrapred_test.cc @@ -131,6 +131,7 @@ using std::tr1::make_tuple; #if HAVE_SSE2 #if CONFIG_VP9_HIGHBITDEPTH +#if CONFIG_USE_X86INC #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest, ::testing::Values( @@ -179,7 +180,8 @@ INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest, &vp9_highbd_tm_predictor_4x4_c, 4, 8), make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, &vp9_highbd_tm_predictor_8x8_c, 8, 8))); -#endif +#endif // !ARCH_X86_64 + #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest, ::testing::Values( @@ -235,7 +237,7 @@ INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest, &vp9_highbd_tm_predictor_4x4_c, 4, 10), make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, &vp9_highbd_tm_predictor_8x8_c, 8, 10))); -#endif +#endif // !ARCH_X86_64 #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest, @@ -292,7 +294,8 @@ INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest, &vp9_highbd_tm_predictor_4x4_c, 4, 12), make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, &vp9_highbd_tm_predictor_8x8_c, 8, 12))); -#endif +#endif // !ARCH_X86_64 +#endif // CONFIG_USE_X86INC #endif // CONFIG_VP9_HIGHBITDEPTH #endif // HAVE_SSE2 } // namespace diff --git a/vp9/common/vp9_rtcd_defs.pl b/vp9/common/vp9_rtcd_defs.pl index 5443d3c..2dd0e2d 100644 --- a/vp9/common/vp9_rtcd_defs.pl +++ b/vp9/common/vp9_rtcd_defs.pl @@ -587,7 +587,7 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { specialize qw/vp9_highbd_v_predictor_16x16/, "$sse2_x86inc"; add_proto qw/void vp9_highbd_tm_predictor_16x16/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; - specialize qw/vp9_highbd_tm_predictor_16x16/, "$sse2_x86_64"; + specialize qw/vp9_highbd_tm_predictor_16x16/, "$sse2_x86_64_x86inc"; add_proto qw/void vp9_highbd_dc_predictor_16x16/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; specialize qw/vp9_highbd_dc_predictor_16x16/, "$sse2_x86inc"; @@ -626,10 +626,10 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { specialize qw/vp9_highbd_v_predictor_32x32/, "$sse2_x86inc"; add_proto qw/void vp9_highbd_tm_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; - specialize qw/vp9_highbd_tm_predictor_32x32/, "$sse2_x86_64"; + specialize qw/vp9_highbd_tm_predictor_32x32/, "$sse2_x86_64_x86inc"; add_proto qw/void vp9_highbd_dc_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; - specialize qw/vp9_highbd_dc_predictor_32x32/, "$sse2_x86_64"; + specialize qw/vp9_highbd_dc_predictor_32x32/, "$sse2_x86_64_x86inc"; add_proto qw/void vp9_highbd_dc_top_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; specialize qw/vp9_highbd_dc_top_predictor_32x32/; -- 2.7.4