[Bf-blender-cvs] [f66554706b5] temp-cycles-denoising: Cycles Denoising: Remove obsolete filter kernel and argument
Lukas Stockner
noreply at git.blender.org
Wed Apr 19 20:46:52 CEST 2017
Commit: f66554706b567e3e00f0340be2abd588c7571aa4
Author: Lukas Stockner
Date: Sun Apr 16 19:59:16 2017 +0200
Branches: temp-cycles-denoising
https://developer.blender.org/rBf66554706b567e3e00f0340be2abd588c7571aa4
Cycles Denoising: Remove obsolete filter kernel and argument
===================================================================
M intern/cycles/device/device_cpu.cpp
M intern/cycles/device/device_cuda.cpp
M intern/cycles/device/opencl/opencl_base.cpp
M intern/cycles/kernel/filter/filter_transform.h
M intern/cycles/kernel/filter/filter_transform_gpu.h
M intern/cycles/kernel/filter/filter_transform_sse.h
M intern/cycles/kernel/kernels/cpu/filter_cpu.h
M intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
M intern/cycles/kernel/kernels/cuda/filter.cu
M intern/cycles/kernel/kernels/opencl/filter.cl
===================================================================
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 0a75dff9383..45ab7a045e8 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -177,7 +177,6 @@ public:
KernelFunctions<void(*)(int, TilesInfo*, int, int, float*, float*, float*, float*, float*, int*, int, int, bool)> filter_divide_shadow_kernel;
KernelFunctions<void(*)(int, TilesInfo*, int, int, int, int, float*, float*, int*, int, int, bool)> filter_get_feature_kernel;
KernelFunctions<void(*)(int, int, float*, float*, float*, float*, int*, int)> filter_combine_halves_kernel;
- KernelFunctions<void(*)(int, int, int, float*, int, int, int, int)> filter_divide_combined_kernel;
KernelFunctions<void(*)(int, int, float*, float*, float*, int*, int, int, float, float)> filter_nlm_calc_difference_kernel;
KernelFunctions<void(*)(float*, float*, int*, int, int)> filter_nlm_blur_kernel;
@@ -185,7 +184,7 @@ public:
KernelFunctions<void(*)(int, int, float*, float*, float*, float*, int*, int, int)> filter_nlm_update_output_kernel;
KernelFunctions<void(*)(float*, float*, int*, int)> filter_nlm_normalize_kernel;
- KernelFunctions<void(*)(int, float*, int, int, int, float*, int*, int*, int, int, float)> filter_construct_transform_kernel;
+ KernelFunctions<void(*)(float*, int, int, int, float*, int*, int*, int, int, float)> filter_construct_transform_kernel;
KernelFunctions<void(*)(int, int, float*, float*, float*, float*, float*, int*, float*, float3*, int*, int*, int, int, int, int)> filter_nlm_construct_gramian_kernel;
KernelFunctions<void(*)(int, int, int, int, int, float*, int*, float*, float3*, int*, int)> filter_finalize_kernel;
@@ -212,7 +211,6 @@ public:
REGISTER_KERNEL(filter_divide_shadow),
REGISTER_KERNEL(filter_get_feature),
REGISTER_KERNEL(filter_combine_halves),
- REGISTER_KERNEL(filter_divide_combined),
REGISTER_KERNEL(filter_nlm_calc_difference),
REGISTER_KERNEL(filter_nlm_blur),
REGISTER_KERNEL(filter_nlm_calc_weight),
@@ -446,8 +444,7 @@ public:
{
for(int y = 0; y < task->filter_area.w; y++) {
for(int x = 0; x < task->filter_area.z; x++) {
- filter_construct_transform_kernel()(task->render_buffer.samples,
- (float*) task->buffer.mem.device_pointer,
+ filter_construct_transform_kernel()((float*) task->buffer.mem.device_pointer,
x + task->filter_area.x,
y + task->filter_area.y,
y*task->filter_area.z + x,
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 9d1e58e3f7a..af8d6e58614 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1016,8 +1016,7 @@ public:
task->storage.w,
task->storage.h);
- void *args[] = {&task->render_buffer.samples,
- &task->buffer.mem.device_pointer,
+ void *args[] = {&task->buffer.mem.device_pointer,
&task->storage.transform.device_pointer,
&task->storage.rank.device_pointer,
&task->filter_area,
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp
index 4e67a128219..9c059f5942e 100644
--- a/intern/cycles/device/opencl/opencl_base.cpp
+++ b/intern/cycles/device/opencl/opencl_base.cpp
@@ -218,7 +218,6 @@ bool OpenCLDeviceBase::load_kernels(const DeviceRequestedFeatures& requested_fea
denoising_program.add_kernel(ustring("filter_get_feature"));
denoising_program.add_kernel(ustring("filter_combine_halves"));
denoising_program.add_kernel(ustring("filter_construct_transform"));
- denoising_program.add_kernel(ustring("filter_divide_combined"));
denoising_program.add_kernel(ustring("filter_nlm_calc_difference"));
denoising_program.add_kernel(ustring("filter_nlm_blur"));
denoising_program.add_kernel(ustring("filter_nlm_calc_weight"));
@@ -675,7 +674,6 @@ bool OpenCLDeviceBase::denoising_construct_transform(DenoisingTask *task)
cl_kernel ckFilterConstructTransform = denoising_program(ustring("filter_construct_transform"));
kernel_set_args(ckFilterConstructTransform, 0,
- task->render_buffer.samples,
buffer_mem,
transform_mem,
rank_mem,
diff --git a/intern/cycles/kernel/filter/filter_transform.h b/intern/cycles/kernel/filter/filter_transform.h
index 143a89a1708..f5fcb3353dd 100644
--- a/intern/cycles/kernel/filter/filter_transform.h
+++ b/intern/cycles/kernel/filter/filter_transform.h
@@ -16,7 +16,7 @@
CCL_NAMESPACE_BEGIN
-ccl_device void kernel_filter_construct_transform(int sample, float ccl_readonly_ptr buffer,
+ccl_device void kernel_filter_construct_transform(float ccl_readonly_ptr buffer,
int x, int y, int4 rect,
int pass_stride,
float *transform, int *rank,
diff --git a/intern/cycles/kernel/filter/filter_transform_gpu.h b/intern/cycles/kernel/filter/filter_transform_gpu.h
index 9069f79534e..3595f749fc4 100644
--- a/intern/cycles/kernel/filter/filter_transform_gpu.h
+++ b/intern/cycles/kernel/filter/filter_transform_gpu.h
@@ -16,8 +16,7 @@
CCL_NAMESPACE_BEGIN
-ccl_device void kernel_filter_construct_transform(int sample,
- ccl_global float ccl_readonly_ptr buffer,
+ccl_device void kernel_filter_construct_transform(ccl_global float ccl_readonly_ptr buffer,
int x, int y, int4 rect,
int pass_stride,
ccl_global float *transform,
diff --git a/intern/cycles/kernel/filter/filter_transform_sse.h b/intern/cycles/kernel/filter/filter_transform_sse.h
index 2be5a3cf116..343efafdc7b 100644
--- a/intern/cycles/kernel/filter/filter_transform_sse.h
+++ b/intern/cycles/kernel/filter/filter_transform_sse.h
@@ -16,7 +16,7 @@
CCL_NAMESPACE_BEGIN
-ccl_device void kernel_filter_construct_transform(int sample, float ccl_readonly_ptr buffer,
+ccl_device void kernel_filter_construct_transform(float ccl_readonly_ptr buffer,
int x, int y, int4 rect,
int pass_stride,
float *transform, int *rank,
diff --git a/intern/cycles/kernel/kernels/cpu/filter_cpu.h b/intern/cycles/kernel/kernels/cpu/filter_cpu.h
index 201b377f1d7..8c42c35efd0 100644
--- a/intern/cycles/kernel/kernels/cpu/filter_cpu.h
+++ b/intern/cycles/kernel/kernels/cpu/filter_cpu.h
@@ -51,8 +51,7 @@ void KERNEL_FUNCTION_FULL_NAME(filter_combine_halves)(int x, int y,
int* prefilter_rect,
int r);
-void KERNEL_FUNCTION_FULL_NAME(filter_construct_transform)(int sample,
- float* buffer,
+void KERNEL_FUNCTION_FULL_NAME(filter_construct_transform)(float* buffer,
int x,
int y,
int storage_ofs,
@@ -63,16 +62,6 @@ void KERNEL_FUNCTION_FULL_NAME(filter_construct_transform)(int sample,
int radius,
float pca_threshold);
-void KERNEL_FUNCTION_FULL_NAME(filter_divide_combined)(int x, int y,
- int sample,
- float *buffers,
- int offset,
- int stride,
- int pass_stride,
- int no_denoising_offset);
-
-
-
void KERNEL_FUNCTION_FULL_NAME(filter_nlm_calc_difference)(int dx,
int dy,
float *weightImage,
diff --git a/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
index c334b2a97c1..da93f68f3ed 100644
--- a/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
+++ b/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
@@ -81,13 +81,13 @@ void KERNEL_FUNCTION_FULL_NAME(filter_get_feature)(int sample,
STUB_ASSERT(KERNEL_ARCH, filter_get_feature);
#else
kernel_filter_get_feature(sample, tiles,
- m_offset, v_offset,
- x, y,
- mean, variance,
- load_int4(prefilter_rect),
- buffer_pass_stride,
- buffer_denoising_offset,
- use_split_variance);
+ m_offset, v_offset,
+ x, y,
+ mean, variance,
+ load_int4(prefilter_rect),
+ buffer_pass_stride,
+ buffer_denoising_offset,
+ use_split_variance);
#endif
}
@@ -106,8 +106,7 @@ void KERNEL_FUNCTION_FULL_NAME(filter_combine_halves)(int x, int y,
#endif
}
-void KERNEL_FUNCTION_FULL_NAME(filter_construct_transform)(int sample,
- float* buffer,
+void KERNEL_FUNCTION_FULL_NAME(filter_construct_transform)(float* buffer,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list