[Bf-blender-cvs] [7a26ded06a] soc-2016-cycles_denoising: Cycles Denoising: Remove useless functions

[Lukas Stockner]

Commit: 7a26ded06adf57ddcb022737b83fa910156082d3
Author: Lukas Stockner
Date:   Sun Jan 29 21:49:08 2017 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB7a26ded06adf57ddcb022737b83fa910156082d3

Cycles Denoising: Remove useless functions

===================================================================

M	intern/cycles/kernel/filter/filter_features.h
M	intern/cycles/kernel/filter/filter_features_sse.h

===================================================================

diff --git a/intern/cycles/kernel/filter/filter_features.h b/intern/cycles/kernel/filter/filter_features.h
index 967d0e9a3b..6bb53cc820 100644
--- a/intern/cycles/kernel/filter/filter_features.h
+++ b/intern/cycles/kernel/filter/filter_features.h
@@ -70,31 +70,6 @@ ccl_device_inline void filter_get_features(int3 pixel, float ccl_readonly_ptr bu
 #endif
 }
 
-ccl_device_inline void filter_get_feature_variance(float ccl_readonly_ptr buffer, float *features, float ccl_readonly_ptr scale, int pass_stride)
-{
-	float *feature = features;
-	*(feature++) = 0.0f;
-	*(feature++) = 0.0f;
-#ifdef DENOISE_TEMPORAL
-	*(feature++) = 0.0f;
-#endif
-	*(feature++) = ccl_get_feature(7);
-	*(feature++) = ccl_get_feature(1);
-	*(feature++) = ccl_get_feature(3);
-	*(feature++) = ccl_get_feature(5);
-	*(feature++) = 0.0f;//ccl_get_feature(9);
-	*(feature++) = ccl_get_feature(11);
-	*(feature++) = ccl_get_feature(13);
-	*(feature++) = ccl_get_feature(15);
-#ifdef DENOISE_SECOND_ORDER_SCREEN
-	features[10] = 0.0f;
-	features[11] = 0.0f;
-	features[12] = 0.0f;
-#endif
-	for(int i = 0; i < DENOISE_FEATURES; i++)
-		features[i] *= scale[i]*scale[i];
-}
-
 ccl_device_inline void filter_get_feature_scales(int3 pixel, float ccl_readonly_ptr buffer, float *scales, float ccl_readonly_ptr mean, int pass_stride)
 {
 	*(scales++) = fabsf(pixel.x - *(mean++)); //X
diff --git a/intern/cycles/kernel/filter/filter_features_sse.h b/intern/cycles/kernel/filter/filter_features_sse.h
index 80e5b0282d..623a0b8374 100644
--- a/intern/cycles/kernel/filter/filter_features_sse.h
+++ b/intern/cycles/kernel/filter/filter_features_sse.h
@@ -139,44 +139,5 @@ ccl_device_inline void filter_calculate_scale_sse(__m128 *scale)
 	scale[7] = _mm_rcp_ps(_mm_max_ps(_mm_hmax_ps(_mm_sqrt_ps(scale[7])), _mm_set1_ps(0.01f))); //AlbedoB
 }
 
-ccl_device_inline void filter_get_feature_variance_sse(__m128 x, __m128 y, __m128 active_pixels, float ccl_readonly_ptr buffer, __m128 *features, __m128 ccl_readonly_ptr scale, int pass_stride)
-{
-	__m128 *feature = features;
-	*(feature++) = _mm_setzero_ps();
-	*(feature++) = _mm_setzero_ps();
-#ifdef DENOISE_TEMPORAL
-	*(feature++) = _mm_setzero_ps();
-#endif
-	*(feature++) = _mm_mask_ps(ccl_get_feature_sse( 7), active_pixels);
-	*(feature++) = _mm_mask_ps(ccl_get_feature_sse( 1), active_pixels);
-	*(feature++) = _mm_mask_ps(ccl_get_feature_sse( 3), active_pixels);
-	*(feature++) = _mm_mask_ps(ccl_get_feature_sse( 5), active_pixels);
-	*(feature++) = _mm_setzero_ps();//_mm_mask_ps(ccl_get_feature_sse( 9), active_pixels);
-	*(feature++) = _mm_mask_ps(ccl_get_feature_sse(11), active_pixels);
-	*(feature++) = _mm_mask_ps(ccl_get_feature_sse(13), active_pixels);
-	*(feature++) = _mm_mask_ps(ccl_get_feature_sse(15), active_pixels);
-#ifdef DENOISE_SECOND_ORDER_SCREEN
-	features[10] = _mm_setzero_ps();
-	features[11] = _mm_setzero_ps();
-	features[12] = _mm_setzero_ps();
-#endif
-	for(int i = 0; i < DENOISE_FEATURES; i++)
-		features[i] = _mm_mul_ps(features[i], _mm_mul_ps(scale[i], scale[i]));
-}
-
-ccl_device_inline void filter_get_pixel_color_sse(float ccl_readonly_ptr buffer, __m128 active_pixels, __m128 *color, int pass_stride)
-{
-	color[0] = _mm_mask_ps(ccl_get_feature_sse(16), active_pixels);
-	color[1] = _mm_mask_ps(ccl_get_feature_sse(18), active_pixels);
-	color[2] = _mm_mask_ps(ccl_get_feature_sse(20), active_pixels);
-}
-
-ccl_device_inline void filter_get_pixel_variance_3_sse(float ccl_readonly_ptr buffer, __m128 active_pixels, __m128 *var, int pass_stride)
-{
-	var[0] = _mm_mask_ps(ccl_get_feature_sse(17), active_pixels);
-	var[1] = _mm_mask_ps(ccl_get_feature_sse(19), active_pixels);
-	var[2] = _mm_mask_ps(ccl_get_feature_sse(21), active_pixels);
-}
-
 
 CCL_NAMESPACE_END
\ No newline at end of file