diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-20 18:58:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-20 19:15:21 +0300 |
| commit | 7d111f4ac2b1321fc9387922c606381cadd3f3ad (patch) | |
| tree | 49589cb1f464b512dec2b70a0e4e4660c70fc2df /intern/cycles | |
| parent | 0baa876b8347a81a457dadaa1f11acc7530c2769 (diff) | |
Cleanup: remove unused code
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/device/cpu/kernel.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/device/cpu/kernel.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_arch.h | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_arch_impl.h | 19 |
4 files changed, 1 insertions, 34 deletions
diff --git a/intern/cycles/device/cpu/kernel.cpp b/intern/cycles/device/cpu/kernel.cpp index bbad2f3147d..3b253c094fd 100644 --- a/intern/cycles/device/cpu/kernel.cpp +++ b/intern/cycles/device/cpu/kernel.cpp @@ -50,9 +50,7 @@ CPUKernels::CPUKernels() REGISTER_KERNEL(adaptive_sampling_filter_x), REGISTER_KERNEL(adaptive_sampling_filter_y), /* Cryptomatte. */ - REGISTER_KERNEL(cryptomatte_postprocess), - /* Bake. */ - REGISTER_KERNEL(bake) + REGISTER_KERNEL(cryptomatte_postprocess) { } diff --git a/intern/cycles/device/cpu/kernel.h b/intern/cycles/device/cpu/kernel.h index 3787fe37a33..5f9cb85389f 100644 --- a/intern/cycles/device/cpu/kernel.h +++ b/intern/cycles/device/cpu/kernel.h @@ -102,10 +102,6 @@ class CPUKernels { CryptomattePostprocessFunction cryptomatte_postprocess; - /* Bake. */ - - CPUKernelFunction<void (*)(const KernelGlobalsCPU *, float *, int, int, int, int, int)> bake; - CPUKernels(); }; diff --git a/intern/cycles/kernel/device/cpu/kernel_arch.h b/intern/cycles/kernel/device/cpu/kernel_arch.h index 7a438b58e73..432ac5e15a9 100644 --- a/intern/cycles/kernel/device/cpu/kernel_arch.h +++ b/intern/cycles/kernel/device/cpu/kernel_arch.h @@ -107,12 +107,4 @@ void KERNEL_FUNCTION_FULL_NAME(cryptomatte_postprocess)(const KernelGlobalsCPU * ccl_global float *render_buffer, int pixel_index); -/* -------------------------------------------------------------------- - * Bake. - */ -/* TODO(sergey): Needs to be re-implemented. Or not? Brecht did it already :) */ - -void KERNEL_FUNCTION_FULL_NAME(bake)( - const KernelGlobalsCPU *kg, float *buffer, int sample, int x, int y, int offset, int stride); - #undef KERNEL_ARCH diff --git a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h index ac606c768db..ba777062113 100644 --- a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h +++ b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h @@ -231,25 +231,6 @@ void KERNEL_FUNCTION_FULL_NAME(cryptomatte_postprocess)(const KernelGlobalsCPU * #endif } -/* -------------------------------------------------------------------- - * Bake. - */ -/* TODO(sergey): Needs to be re-implemented. Or not? Brecht did it already :) */ - -void KERNEL_FUNCTION_FULL_NAME(bake)( - const KernelGlobalsCPU *kg, float *buffer, int sample, int x, int y, int offset, int stride) -{ -#if 0 -# ifdef KERNEL_STUB - STUB_ASSERT(KERNEL_ARCH, bake); -# else -# ifdef __BAKING__ - kernel_bake_evaluate(kg, buffer, sample, x, y, offset, stride); -# endif -# endif /* KERNEL_STUB */ -#endif -} - #undef KERNEL_INVOKE #undef DEFINE_INTEGRATOR_KERNEL #undef DEFINE_INTEGRATOR_SHADE_KERNEL |