[Bf-blender-cvs] [73e8114ad81] temp-cycles-denoising: Cycles Denoising: Remove variable for split kernel variance

Lukas Stockner noreply at git.blender.org
Wed Apr 19 20:46:54 CEST 2017


Commit: 73e8114ad81c63e94073b22d0e49dd490ecab2a5
Author: Lukas Stockner
Date:   Mon Apr 17 00:07:05 2017 +0200
Branches: temp-cycles-denoising
https://developer.blender.org/rB73e8114ad81c63e94073b22d0e49dd490ecab2a5

Cycles Denoising: Remove variable for split kernel variance

The devices know whether they're using the split kernel or not, there's no need to store the information.

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

M	intern/cycles/device/device_cpu.cpp
M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/device/device_denoising.h

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 45ab7a045e8..efced170434 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -562,7 +562,7 @@ public:
 				                              &task->rect.x,
 				                              task->render_buffer.pass_stride,
 				                              task->render_buffer.denoising_data_offset,
-				                              task->use_split_variance);
+				                              use_split_kernel);
 			}
 		}
 		return true;
@@ -586,7 +586,7 @@ public:
 				                            &task->rect.x,
 				                            task->render_buffer.pass_stride,
 				                            task->render_buffer.denoising_data_offset,
-				                            task->use_split_variance);
+				                            use_split_kernel);
 			}
 		}
 		return true;
@@ -634,7 +634,6 @@ public:
 
 		denoising.filter_area = make_int4(tile.x, tile.y, tile.w, tile.h);
 		denoising.render_buffer.samples = tile.sample;
-		denoising.use_split_variance = use_split_kernel;
 
 		RenderTile rtiles[9];
 		rtiles[4] = tile;
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index af8d6e58614..151f88872d5 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1188,6 +1188,7 @@ public:
 		                   task->rect.z-task->rect.x,
 		                   task->rect.w-task->rect.y);
 
+		bool use_split_variance = use_split_kernel();
 		void *args[] = {&task->render_buffer.samples,
 		                &task->tiles_mem.device_pointer,
 		                &a_ptr,
@@ -1198,7 +1199,7 @@ public:
 		                &task->rect,
 		                &task->render_buffer.pass_stride,
 		                &task->render_buffer.denoising_data_offset,
-		                &task->use_split_variance};
+		                &use_split_variance};
 		CUDA_LAUNCH_KERNEL(cuFilterDivideShadow, args);
 		cuda_assert(cuCtxSynchronize());
 
@@ -1224,6 +1225,7 @@ public:
 		                   task->rect.z-task->rect.x,
 		                   task->rect.w-task->rect.y);
 
+		bool use_split_variance = use_split_kernel();
 		void *args[] = {&task->render_buffer.samples,
 		                &task->tiles_mem.device_pointer,
 				        &mean_offset,
@@ -1233,7 +1235,7 @@ public:
 		                &task->rect,
 		                &task->render_buffer.pass_stride,
 		                &task->render_buffer.denoising_data_offset,
-		                &task->use_split_variance};
+		                &use_split_variance};
 		CUDA_LAUNCH_KERNEL(cuFilterGetFeature, args);
 		cuda_assert(cuCtxSynchronize());
 
diff --git a/intern/cycles/device/device_denoising.h b/intern/cycles/device/device_denoising.h
index 72b7ba721cf..86d8eb64386 100644
--- a/intern/cycles/device/device_denoising.h
+++ b/intern/cycles/device/device_denoising.h
@@ -31,7 +31,6 @@ public:
 	int radius;
 	float nlm_k_2;
 	float pca_threshold;
-	bool use_split_variance;
 
 	/* Pointer and parameters of the RenderBuffers. */
 	struct RenderBuffers {




More information about the Bf-blender-cvs mailing list