[Bf-blender-cvs] [54632dc8307] master: Cycles: Remove util_debug include from kernel code
Sergey Sharybin
noreply at git.blender.org
Fri Jan 19 15:26:47 CET 2018
Commit: 54632dc8307e30a711c5fceed79eb1b083fd40dc
Author: Sergey Sharybin
Date: Fri Jan 19 15:21:34 2018 +0100
Branches: master
https://developer.blender.org/rB54632dc8307e30a711c5fceed79eb1b083fd40dc
Cycles: Remove util_debug include from kernel code
Not sure why it was in there, all the debug flags stuff is to be handled outside
of kernel.
===================================================================
M intern/cycles/kernel/kernel_compat_cpu.h
M intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
M intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index 6f63c8f77a2..61cd90e9d2a 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -35,7 +35,6 @@
# define __NODES_FEATURES__ NODE_FEATURE_ALL
#endif
-#include "util/util_debug.h"
#include "util/util_math.h"
#include "util/util_simd.h"
#include "util/util_half.h"
diff --git a/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
index ab39260784b..504622ecfd9 100644
--- a/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
+++ b/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
@@ -25,7 +25,6 @@
#include "kernel/filter/filter_kernel.h"
#ifdef KERNEL_STUB
-# include "util/util_debug.h"
# define STUB_ASSERT(arch, name) assert(!(#name " kernel stub for architecture " #arch " was called!"))
#endif
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
index fdeb7dcd3e4..ccca023a15f 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
@@ -59,7 +59,6 @@
# include "kernel/split/kernel_buffer_update.h"
# endif /* __SPLIT_KERNEL__ */
#else
-# include "util/util_debug.h"
# define STUB_ASSERT(arch, name) assert(!(#name " kernel stub for architecture " #arch " was called!"))
# ifdef __SPLIT_KERNEL__
More information about the Bf-blender-cvs
mailing list