Commit: 7d111f4ac2b1321fc9387922c606381cadd3f3ad
Author: Brecht Van Lommel
Date: Wed Oct 20 17:58:16 2021 +0200
Branches: master
https://developer.blender.org/rB7d111f4ac2b1321fc9387922c606381cadd3f3ad
Cleanup: remove unused code
===================================================================
M intern/cycles/device/cpu/kernel.cpp
M intern/cycles/device/cpu/kernel.h
M intern/cycles/kernel/device/cpu/kernel_arch.h
M intern/cycles/kernel/device/cpu/kernel_arch_impl.h
===================================================================
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
