Remove variance vtable from rtcd

Change-Id: Idd2722a538423b451e1e3495f89a7141480493d6

1 files changed, 0 insertions, 79 deletions

diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c
index 356e32c3f..44e83fdc7 100644
--- a/vp8/encoder/generic/csystemdependent.c
+++ b/vp8/encoder/generic/csystemdependent.c
@@ -23,80 +23,6 @@ extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER
 void vp8_cmachine_specific_config(VP8_COMP *cpi) {
 #if CONFIG_RUNTIME_CPU_DETECT
   cpi->rtcd.common                    = &cpi->common.rtcd;
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.sad32x32              = vp8_sad32x32_c;
-#endif
-  cpi->rtcd.variance.sad16x16              = vp8_sad16x16_c;
-  cpi->rtcd.variance.sad16x8               = vp8_sad16x8_c;
-  cpi->rtcd.variance.sad8x16               = vp8_sad8x16_c;
-  cpi->rtcd.variance.sad8x8                = vp8_sad8x8_c;
-  cpi->rtcd.variance.sad4x4                = vp8_sad4x4_c;
-
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.sad32x32x3            = vp8_sad32x32x3_c;
-#endif
-  cpi->rtcd.variance.sad16x16x3            = vp8_sad16x16x3_c;
-  cpi->rtcd.variance.sad16x8x3             = vp8_sad16x8x3_c;
-  cpi->rtcd.variance.sad8x16x3             = vp8_sad8x16x3_c;
-  cpi->rtcd.variance.sad8x8x3              = vp8_sad8x8x3_c;
-  cpi->rtcd.variance.sad4x4x3              = vp8_sad4x4x3_c;
-
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.sad32x32x8            = vp8_sad32x32x8_c;
-#endif
-  cpi->rtcd.variance.sad16x16x8            = vp8_sad16x16x8_c;
-  cpi->rtcd.variance.sad16x8x8             = vp8_sad16x8x8_c;
-  cpi->rtcd.variance.sad8x16x8             = vp8_sad8x16x8_c;
-  cpi->rtcd.variance.sad8x8x8              = vp8_sad8x8x8_c;
-  cpi->rtcd.variance.sad4x4x8              = vp8_sad4x4x8_c;
-
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.sad32x32x4d           = vp8_sad32x32x4d_c;
-#endif
-  cpi->rtcd.variance.sad16x16x4d           = vp8_sad16x16x4d_c;
-  cpi->rtcd.variance.sad16x8x4d            = vp8_sad16x8x4d_c;
-  cpi->rtcd.variance.sad8x16x4d            = vp8_sad8x16x4d_c;
-  cpi->rtcd.variance.sad8x8x4d             = vp8_sad8x8x4d_c;
-  cpi->rtcd.variance.sad4x4x4d             = vp8_sad4x4x4d_c;
-#if ARCH_X86 || ARCH_X86_64
-  cpi->rtcd.variance.copy32xn              = vp8_copy32xn_c;
-#endif
-  cpi->rtcd.variance.var4x4                = vp8_variance4x4_c;
-  cpi->rtcd.variance.var8x8                = vp8_variance8x8_c;
-  cpi->rtcd.variance.var8x16               = vp8_variance8x16_c;
-  cpi->rtcd.variance.var16x8               = vp8_variance16x8_c;
-  cpi->rtcd.variance.var16x16              = vp8_variance16x16_c;
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.var32x32              = vp8_variance32x32_c;
-#endif
-
-  cpi->rtcd.variance.subpixvar4x4          = vp8_sub_pixel_variance4x4_c;
-  cpi->rtcd.variance.subpixvar8x8          = vp8_sub_pixel_variance8x8_c;
-  cpi->rtcd.variance.subpixvar8x16         = vp8_sub_pixel_variance8x16_c;
-  cpi->rtcd.variance.subpixvar16x8         = vp8_sub_pixel_variance16x8_c;
-  cpi->rtcd.variance.subpixvar16x16        = vp8_sub_pixel_variance16x16_c;
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.subpixvar32x32        = vp8_sub_pixel_variance32x32_c;
-#endif
-  cpi->rtcd.variance.halfpixvar16x16_h     = vp8_variance_halfpixvar16x16_h_c;
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.halfpixvar32x32_h     = vp8_variance_halfpixvar32x32_h_c;
-#endif
-  cpi->rtcd.variance.halfpixvar16x16_v     = vp8_variance_halfpixvar16x16_v_c;
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.halfpixvar32x32_v     = vp8_variance_halfpixvar32x32_v_c;
-#endif
-  cpi->rtcd.variance.halfpixvar16x16_hv    = vp8_variance_halfpixvar16x16_hv_c;
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.halfpixvar32x32_hv    = vp8_variance_halfpixvar32x32_hv_c;
-#endif
-  cpi->rtcd.variance.subpixmse16x16        = vp8_sub_pixel_mse16x16_c;
-#if CONFIG_SUPERBLOCKS
-  cpi->rtcd.variance.subpixmse32x32        = vp8_sub_pixel_mse32x32_c;
-#endif
-
-  cpi->rtcd.variance.mse16x16              = vp8_mse16x16_c;
-  cpi->rtcd.variance.getmbss               = vp8_get_mb_ss_c;
 
   cpi->rtcd.fdct.short8x8                  = vp8_short_fdct8x8_c;
   cpi->rtcd.fdct.short16x16                = vp8_short_fdct16x16_c;
@@ -118,16 +44,11 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi) {
   cpi->rtcd.search.refining_search         = vp8_refining_search_sad;
   cpi->rtcd.search.diamond_search          = vp8_diamond_search_sad;
   cpi->rtcd.temporal.apply                 = vp8_temporal_filter_apply_c;
-  cpi->rtcd.variance.satd16x16             = vp8_satd16x16_c;
   cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_c;
   cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_c;
   cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_c;
   cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_c;
   cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_c;
-#if CONFIG_INTERNAL_STATS
-  cpi->rtcd.variance.ssimpf_8x8            = vp8_ssim_parms_8x8_c;
-  cpi->rtcd.variance.ssimpf_16x16          = vp8_ssim_parms_16x16_c;
-#endif
 #endif
 
   vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame;