invoke macro removal encodemb

Change-Id: I321280abcf48f3dc16e194d29bde2bd3baec6006

2 files changed, 0 insertions, 102 deletions

diff --git a/vp8/encoder/x86/encodemb_x86.h b/vp8/encoder/x86/encodemb_x86.h
deleted file mode 100644
index 69b3edd66..000000000
--- a/vp8/encoder/x86/encodemb_x86.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  Copyright (c) 2010 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.
- */
-
-
-#ifndef ENCODEMB_X86_H
-#define ENCODEMB_X86_H
-
-
-/* Note:
- *
- * This platform is commonly built for runtime CPU detection. If you modify
- * any of the function mappings present in this file, be sure to also update
- * them in the function pointer initialization code
- */
-#if HAVE_MMX
-extern prototype_berr(vp8_block_error_mmx);
-extern prototype_mberr(vp8_mbblock_error_mmx);
-extern prototype_mbuverr(vp8_mbuverror_mmx);
-extern prototype_subb(vp8_subtract_b_mmx);
-extern prototype_submby(vp8_subtract_mby_mmx);
-extern prototype_submbuv(vp8_subtract_mbuv_mmx);
-
-
-#if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_encodemb_berr
-#define vp8_encodemb_berr vp8_block_error_mmx
-
-#undef  vp8_encodemb_mberr
-#define vp8_encodemb_mberr vp8_mbblock_error_mmx
-
-#undef  vp8_encodemb_mbuverr
-#define vp8_encodemb_mbuverr vp8_mbuverror_mmx
-
-#undef  vp8_encodemb_subb
-#define vp8_encodemb_subb vp8_subtract_b_mmx
-
-#undef  vp8_encodemb_submby
-#define vp8_encodemb_submby vp8_subtract_mby_mmx
-
-#undef  vp8_encodemb_submbuv
-#define vp8_encodemb_submbuv vp8_subtract_mbuv_mmx
-
-#endif
-#endif
-
-
-#if HAVE_SSE2
-extern prototype_berr(vp8_block_error_xmm);
-extern prototype_mberr(vp8_mbblock_error_xmm);
-extern prototype_mbuverr(vp8_mbuverror_xmm);
-extern prototype_subb(vp8_subtract_b_sse2);
-extern prototype_submby(vp8_subtract_mby_sse2);
-extern prototype_submbuv(vp8_subtract_mbuv_sse2);
-
-#if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_encodemb_berr
-#define vp8_encodemb_berr vp8_block_error_xmm
-
-#undef  vp8_encodemb_mberr
-#define vp8_encodemb_mberr vp8_mbblock_error_xmm
-
-#undef  vp8_encodemb_mbuverr
-#define vp8_encodemb_mbuverr vp8_mbuverror_xmm
-
-#undef  vp8_encodemb_subb
-#define vp8_encodemb_subb vp8_subtract_b_sse2
-
-#undef  vp8_encodemb_submby
-#define vp8_encodemb_submby vp8_subtract_mby_sse2
-
-#undef  vp8_encodemb_submbuv
-#define vp8_encodemb_submbuv vp8_subtract_mbuv_sse2
-
-#endif
-#endif
-
-
-#endif
diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp8/encoder/x86/x86_csystemdependent.c
index a169b493e..053601939 100644
--- a/vp8/encoder/x86/x86_csystemdependent.c
+++ b/vp8/encoder/x86/x86_csystemdependent.c
@@ -88,25 +88,8 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi) {
    */
 
   /* Override default functions with fastest ones for this CPU. */
-#if HAVE_MMX
-  if (flags & HAS_MMX) {
-    cpi->rtcd.encodemb.berr                  = vp8_block_error_mmx;
-    cpi->rtcd.encodemb.mberr                 = vp8_mbblock_error_mmx;
-    cpi->rtcd.encodemb.mbuverr               = vp8_mbuverror_mmx;
-    cpi->rtcd.encodemb.subb                  = vp8_subtract_b_mmx;
-    cpi->rtcd.encodemb.submby                = vp8_subtract_mby_mmx;
-    cpi->rtcd.encodemb.submbuv               = vp8_subtract_mbuv_mmx;
-  }
-#endif
-
 #if HAVE_SSE2
   if (flags & HAS_SSE2) {
-    cpi->rtcd.encodemb.berr                  = vp8_block_error_xmm;
-    cpi->rtcd.encodemb.mberr                 = vp8_mbblock_error_xmm;
-    cpi->rtcd.encodemb.mbuverr               = vp8_mbuverror_xmm;
-    cpi->rtcd.encodemb.subb                  = vp8_subtract_b_sse2;
-    cpi->rtcd.encodemb.submby                = vp8_subtract_mby_sse2;
-    cpi->rtcd.encodemb.submbuv               = vp8_subtract_mbuv_sse2;
     cpi->rtcd.temporal.apply                 = vp8_temporal_filter_apply_sse2;
 
   }