[Bf-blender-cvs] [ded186c2bb] temp-cycles-denoising: Cycles Denoising: Remove unused preprocessor option

[Lukas Stockner]

Commit: ded186c2bb487eef0778e1c1ad1aa36aab006299
Author: Lukas Stockner
Date:   Fri Mar 24 18:50:12 2017 +0100
Branches: temp-cycles-denoising
https://developer.blender.org/rBded186c2bb487eef0778e1c1ad1aa36aab006299

Cycles Denoising: Remove unused preprocessor option

It was used for a quick test a long time ago and it no longer relevant.

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

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

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

diff --git a/intern/cycles/filter/filter_features.h b/intern/cycles/filter/filter_features.h
index a0b0e1325e..b25649f497 100644
--- a/intern/cycles/filter/filter_features.h
+++ b/intern/cycles/filter/filter_features.h
@@ -58,11 +58,6 @@ ccl_device_inline void filter_get_features(int2 pixel, ccl_global float ccl_read
 		for(int i = 0; i < DENOISE_FEATURES; i++)
 			features[i] -= mean[i];
 	}
-#ifdef DENOISE_SECOND_ORDER_SCREEN
-	features[10] = features[0]*features[0];
-	features[11] = features[1]*features[1];
-	features[12] = features[0]*features[1];
-#endif
 }
 
 ccl_device_inline void filter_get_feature_scales(int2 pixel, ccl_global float ccl_readonly_ptr buffer, ccl_local_param float *scales, float ccl_readonly_ptr mean, int pass_stride)
diff --git a/intern/cycles/filter/filter_features_sse.h b/intern/cycles/filter/filter_features_sse.h
index 0ec6150108..5de7a7b348 100644
--- a/intern/cycles/filter/filter_features_sse.h
+++ b/intern/cycles/filter/filter_features_sse.h
@@ -47,17 +47,10 @@ ccl_device_inline void filter_get_features_sse(__m128 x, __m128 y, __m128 active
 	features[9] = ccl_get_feature_sse(7);
 	if(mean) {
 		for(int i = 0; i < DENOISE_FEATURES; i++)
-			features[i] = _mm_mask_ps(_mm_sub_ps(features[i], mean[i]), active_pixels);
+			features[i] = _mm_sub_ps(features[i], mean[i]);
 	}
-	else {
-		for(int i = 0; i < DENOISE_FEATURES; i++)
-			features[i] = _mm_mask_ps(features[i], active_pixels);
-	}
-#ifdef DENOISE_SECOND_ORDER_SCREEN
-	features[10] = _mm_mul_ps(features[0], features[0]);
-	features[11] = _mm_mul_ps(features[1], features[1]);
-	features[12] = _mm_mul_ps(features[0], features[1]);
-#endif
+	for(int i = 0; i < DENOISE_FEATURES; i++)
+		features[i] = _mm_mask_ps(features[i], active_pixels);
 }
 
 ccl_device_inline void filter_get_feature_scales_sse(__m128 x, __m128 y, __m128 active_pixels, float ccl_readonly_ptr buffer, __m128 *scales, __m128 ccl_readonly_ptr mean, int pass_stride)
@@ -93,7 +86,7 @@ ccl_device_inline void filter_calculate_scale_sse(__m128 *scale)
 	scale[1] = _mm_rcp_ps(_mm_max_ps(_mm_hmax_ps(scale[1]), _mm_set1_ps(0.01f)));
 	scale[2] = _mm_rcp_ps(_mm_max_ps(_mm_hmax_ps(scale[2]), _mm_set1_ps(0.01f)));
 	scale[6] = _mm_rcp_ps(_mm_max_ps(_mm_hmax_ps(scale[4]), _mm_set1_ps(0.01f)));
-	
+
 	scale[7] = scale[8] = scale[9] = _mm_rcp_ps(_mm_max_ps(_mm_hmax_ps(_mm_sqrt_ps(scale[5])), _mm_set1_ps(0.01f)));
 	scale[3] = scale[4] = scale[5] = _mm_rcp_ps(_mm_max_ps(_mm_hmax_ps(_mm_sqrt_ps(scale[3])), _mm_set1_ps(0.01f)));
 }