shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_rtcd: correct avx2 references"

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -402,25 +402,25 @@

 # variance

 add_proto qw/unsigned int vp9_variance32x16/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

-specialize qw/vp9_variance32x16/, "$sse2_x86inc", "$avx2_x86inc";

+specialize qw/vp9_variance32x16 avx2/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_variance16x32/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

 specialize qw/vp9_variance16x32/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_variance64x32/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

-specialize qw/vp9_variance64x32/, "$sse2_x86inc", "$avx2_x86inc";

+specialize qw/vp9_variance64x32 avx2/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_variance32x64/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

 specialize qw/vp9_variance32x64/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_variance32x32/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

-specialize qw/vp9_variance32x32/, "$sse2_x86inc", "$avx2_x86inc";

+specialize qw/vp9_variance32x32 avx2/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_variance64x64/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

-specialize qw/vp9_variance64x64/, "$sse2_x86inc", "$avx2_x86inc";

+specialize qw/vp9_variance64x64 avx2/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_variance16x16/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

-specialize qw/vp9_variance16x16 mmx/, "$sse2_x86inc", "$avx2_x86inc";

+specialize qw/vp9_variance16x16 mmx avx2/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_variance16x8/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";

 specialize qw/vp9_variance16x8 mmx/, "$sse2_x86inc";

@@ -693,7 +693,7 @@

 specialize qw/vp9_sad4x4x4d sse/;

 add_proto qw/unsigned int vp9_mse16x16/, "const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse";

-specialize qw/vp9_mse16x16 mmx/, "$sse2_x86inc", "$avx2_x86inc";

+specialize qw/vp9_mse16x16 mmx avx2/, "$sse2_x86inc";

 add_proto qw/unsigned int vp9_mse8x16/, "const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse";

 specialize qw/vp9_mse8x16/;