changeset 9592:607c15573359

asm: move avx function assignments into the correct section
author Steve Borho <steve@borho.org>
date Thu, 26 Feb 2015 12:09:37 -0600
parents a183003fb969
children 5aa3d5f8213e
files source/common/x86/asm-primitives.cpp
diffstat 1 files changed, 5 insertions(+-), 4 deletions(-) [+]
line wrap: on
line diff
--- a/source/common/x86/asm-primitives.cpp	Thu Feb 26 11:29:15 2015 -0600
+++ b/source/common/x86/asm-primitives.cpp	Thu Feb 26 12:09:37 2015 -0600
@@ -1047,6 +1047,11 @@ void setupAssemblyPrimitives(EncoderPrim
         p.cu[BLOCK_64x64].copy_sp = (copy_sp_t)x265_blockcopy_ss_64x64_avx;
 
         p.frameInitLowres = x265_frame_init_lowres_core_avx;
+
+        p.pu[LUMA_64x16].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x16_avx;
+        p.pu[LUMA_64x32].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x32_avx;
+        p.pu[LUMA_64x48].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x48_avx;
+        p.pu[LUMA_64x64].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x64_avx;
     }
     if (cpuMask & X265_CPU_XOP)
     {
@@ -1202,10 +1207,6 @@ void setupAssemblyPrimitives(EncoderPrim
 #else
         p.cu[BLOCK_4x4].dct = x265_dct4_avx2;
 #endif
-        p.pu[LUMA_64x16].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x16_avx;
-        p.pu[LUMA_64x32].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x32_avx;
-        p.pu[LUMA_64x48].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x48_avx;
-        p.pu[LUMA_64x64].copy_pp = (copy_pp_t)x265_blockcopy_ss_64x64_avx;
         p.cu[BLOCK_32x32].ssd_s = x265_pixel_ssd_s_32_avx2;
         p.cu[BLOCK_16x16].sse_ss = x265_pixel_ssd_ss_16x16_avx2;