libvpx: Pull from upstream

source/libvpx/test/variance_test.cc

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include <stdlib.h>
@@ skipping 465 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     MMX, VP9VarianceTest,
     ::testing::Values(make_tuple(2, 2, variance4x4_mmx),
                       make_tuple(3, 3, variance8x8_mmx),
                       make_tuple(3, 4, variance8x16_mmx),
                       make_tuple(4, 3, variance16x8_mmx),
                       make_tuple(4, 4, variance16x16_mmx)));
 #endif
 
 #if HAVE_SSE2
+#if CONFIG_USE_X86INC
 const vp9_variance_fn_t variance4x4_sse2 = vp9_variance4x4_sse2;
 const vp9_variance_fn_t variance4x8_sse2 = vp9_variance4x8_sse2;
 const vp9_variance_fn_t variance8x4_sse2 = vp9_variance8x4_sse2;
 const vp9_variance_fn_t variance8x8_sse2 = vp9_variance8x8_sse2;
 const vp9_variance_fn_t variance8x16_sse2 = vp9_variance8x16_sse2;
 const vp9_variance_fn_t variance16x8_sse2 = vp9_variance16x8_sse2;
 const vp9_variance_fn_t variance16x16_sse2 = vp9_variance16x16_sse2;
 const vp9_variance_fn_t variance16x32_sse2 = vp9_variance16x32_sse2;
 const vp9_variance_fn_t variance32x16_sse2 = vp9_variance32x16_sse2;
 const vp9_variance_fn_t variance32x32_sse2 = vp9_variance32x32_sse2;
@@ skipping 93 matching lines @@
                       make_tuple(3, 4, subpel_avg_variance8x16_sse2),
                       make_tuple(4, 3, subpel_avg_variance16x8_sse2),
                       make_tuple(4, 4, subpel_avg_variance16x16_sse2),
                       make_tuple(4, 5, subpel_avg_variance16x32_sse2),
                       make_tuple(5, 4, subpel_avg_variance32x16_sse2),
                       make_tuple(5, 5, subpel_avg_variance32x32_sse2),
                       make_tuple(5, 6, subpel_avg_variance32x64_sse2),
                       make_tuple(6, 5, subpel_avg_variance64x32_sse2),
                       make_tuple(6, 6, subpel_avg_variance64x64_sse2)));
 #endif
+#endif
 
 #if HAVE_SSSE3
+#if CONFIG_USE_X86INC
+
 const vp9_subpixvariance_fn_t subpel_variance4x4_ssse3 =
     vp9_sub_pixel_variance4x4_ssse3;
 const vp9_subpixvariance_fn_t subpel_variance4x8_ssse3 =
     vp9_sub_pixel_variance4x8_ssse3;
 const vp9_subpixvariance_fn_t subpel_variance8x4_ssse3 =
     vp9_sub_pixel_variance8x4_ssse3;
 const vp9_subpixvariance_fn_t subpel_variance8x8_ssse3 =
     vp9_sub_pixel_variance8x8_ssse3;
 const vp9_subpixvariance_fn_t subpel_variance8x16_ssse3 =
     vp9_sub_pixel_variance8x16_ssse3;
@@ skipping 64 matching lines @@
                       make_tuple(3, 4, subpel_avg_variance8x16_ssse3),
                       make_tuple(4, 3, subpel_avg_variance16x8_ssse3),
                       make_tuple(4, 4, subpel_avg_variance16x16_ssse3),
                       make_tuple(4, 5, subpel_avg_variance16x32_ssse3),
                       make_tuple(5, 4, subpel_avg_variance32x16_ssse3),
                       make_tuple(5, 5, subpel_avg_variance32x32_ssse3),
                       make_tuple(5, 6, subpel_avg_variance32x64_ssse3),
                       make_tuple(6, 5, subpel_avg_variance64x32_ssse3),
                       make_tuple(6, 6, subpel_avg_variance64x64_ssse3)));
 #endif
+#endif
 #endif  // CONFIG_VP9_ENCODER
 
 }  // namespace vp9
 
 }  // namespace