[Bf-blender-cvs] [983bc977fac] temp-cycles-denoising: Cycles Denoising: Remove obsolete kernel pass writing option

[Lukas Stockner]

Commit: 983bc977facbe95891a4a7589c4875ca7310eec6
Author: Lukas Stockner
Date:   Sun Apr 16 19:59:01 2017 +0200
Branches: temp-cycles-denoising
https://developer.blender.org/rB983bc977facbe95891a4a7589c4875ca7310eec6

Cycles Denoising: Remove obsolete kernel pass writing option

It was used for cross-buffer denoising, but that was removed a while ago.

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

M	intern/cycles/kernel/kernel_passes.h
M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h
index 989c4883e52..93d979828d9 100644
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@ -335,8 +335,6 @@ ccl_device_inline void kernel_write_light_passes(KernelGlobals *kg, ccl_global f
 ccl_device_inline void kernel_write_result(KernelGlobals *kg, ccl_global float *buffer,
 	int sample, PathRadiance *L, float alpha, bool is_shadow_catcher)
 {
-	int split_passes = (kernel_data.film.denoising_flags & DENOISING_USE_SPLIT_PASSES);
-
 	if(L) {
 		float3 L_sum;
 #ifdef __SHADOW_TRICKS__
@@ -364,16 +362,10 @@ ccl_device_inline void kernel_write_result(KernelGlobals *kg, ccl_global float *
 				float3 noisy, clean;
 				path_radiance_split_denoising(kg, L, &noisy, &clean);
 				kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + 20, sample, noisy);
-				if(split_passes && !(sample & 1)) {
-					kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + 26, sample, noisy);
-				}
 				kernel_write_pass_float3_unaligned(buffer + kernel_data.film.pass_denoising_clean, sample, clean);
 			}
 			else {
 				kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + 20, sample, L_sum);
-				if(split_passes && !(sample & 1)) {
-					kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + 26, sample, L_sum);
-				}
 			}
 
 			kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data, sample, L->denoising_normal);
@@ -390,9 +382,6 @@ ccl_device_inline void kernel_write_result(KernelGlobals *kg, ccl_global float *
 			kernel_write_denoising_shadow(kg, buffer, sample, 0.0f, 0.0f);
 
 			kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + 20, sample, make_float3(0.0f, 0.0f, 0.0f));
-			if(split_passes && !(sample & 1)) {
-				kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + 26, sample, make_float3(0.0f, 0.0f, 0.0f));
-			}
 
 			kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data, sample, make_float3(0.0f, 0.0f, 0.0f));
 			kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + 6, sample, make_float3(0.0f, 0.0f, 0.0f));
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 09296db2113..e13a4ee6a5a 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -429,8 +429,6 @@ typedef enum DenoiseFlag {
 	DENOISING_CLEAN_SUBSURFACE_DIR   = (1 << 6),
 	DENOISING_CLEAN_SUBSURFACE_IND   = (1 << 7),
 	DENOISING_CLEAN_ALL_PASSES       = (1 << 8)-1,
-
-	DENOISING_USE_SPLIT_PASSES       = (1 << 8),
 } DenoiseFlag;
 
 typedef ccl_addr_space struct PathRadiance {