commit 919caadb598d2d162e60ff8368f8a2cb49b95e17
author Tom Finegan <tomfinegan@google.com> Wed Mar 01 10:26:02 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Wed Mar 01 10:26:34 2017 -0800
tree dd6d8319e92bc03d98356e7c0b4a985f3c820331
parent 75fa1a9034bcd7bbcecbdd5f9f555c05e9c10f30

Fix naming inconsistency in aom_dsp cmake source list vars.

The AVX2 intrinsics vars were violating the pattern.

Change-Id: I0bd2e270b7dbb173d753b2f5aeb48823efac4feb

aom_dsp/aom_dsp.cmake

diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index db25df1..91c5bad 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -59,7 +59,7 @@
     "${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_sse4.c"
     "${AOM_ROOT}/aom_dsp/x86/blend_a64_vmask_sse4.c")
 
-set(AOM_DSP_COMMON_AVX2_INTRIN
+set(AOM_DSP_COMMON_INTRIN_AVX2
     "${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c"
     "${AOM_ROOT}/aom_dsp/x86/fwd_txfm_avx2.c"
     "${AOM_ROOT}/aom_dsp/x86/loopfilter_avx2.c")
@@ -161,7 +161,7 @@
   set(AOM_DSP_ENCODER_INTRIN_SSE3 "${AOM_ROOT}/aom_dsp/x86/sad_sse3.asm")
   set(AOM_DSP_ENCODER_ASM_SSE4_1 "${AOM_ROOT}/aom_dsp/x86/sad_sse4.asm")
 
-  set(AOM_DSP_ENCODER_AVX2_INTRIN
+  set(AOM_DSP_ENCODER_INTRIN_AVX2
       "${AOM_ROOT}/aom_dsp/x86/sad4d_avx2.c"
       "${AOM_ROOT}/aom_dsp/x86/sad_avx2.c"
       "${AOM_ROOT}/aom_dsp/x86/sad_impl_avx2.c"
@@ -230,8 +230,8 @@
         ${AOM_DSP_ENCODER_INTRIN_SSE4_1}
         "${AOM_ROOT}/aom_dsp/x86/highbd_variance_sse4.c")
 
-    set(AOM_DSP_ENCODER_AVX2_INTRIN
-        ${AOM_DSP_ENCODER_AVX2_INTRIN}
+    set(AOM_DSP_ENCODER_INTRIN_AVX2
+        ${AOM_DSP_ENCODER_INTRIN_AVX2}
         "${AOM_ROOT}/aom_dsp/x86/sad_highbd_avx2.c")
   endif ()
 
@@ -347,10 +347,10 @@
 
   if (HAVE_AVX2)
     add_intrinsics_object_library("-mavx2" "avx2" "aom_dsp_common"
-                                  "AOM_DSP_COMMON_AVX2_INTRIN")
+                                  "AOM_DSP_COMMON_INTRIN_AVX2")
     if (CONFIG_ENCODERS)
       add_intrinsics_object_library("-mavx2" "avx2" "aom_dsp_encoder"
-                                    "AOM_DSP_ENCODER_AVX2_INTRIN")
+                                    "AOM_DSP_ENCODER_INTRIN_AVX2")
     endif ()
   endif ()