[Bf-blender-cvs] [d3320c54880] master: Cycles: Rearranged macros in kernel_types.h to fix Embree build.

Stefan Werner noreply at git.blender.org
Wed Nov 7 15:20:56 CET 2018


Commit: d3320c54880ac92147acb99b33cecc4c18df11ed
Author: Stefan Werner
Date:   Wed Nov 7 15:20:24 2018 +0100
Branches: master
https://developer.blender.org/rBd3320c54880ac92147acb99b33cecc4c18df11ed

Cycles: Rearranged macros in kernel_types.h to fix Embree build.

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index a30169cc231..7bc9855a807 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -17,6 +17,12 @@
 #ifndef __KERNEL_TYPES_H__
 #define __KERNEL_TYPES_H__
 
+#if !defined(__KERNEL_GPU__) && defined(WITH_EMBREE)
+#  include <embree3/rtcore.h>
+#  include <embree3/rtcore_scene.h>
+#  define __EMBREE__
+#endif
+
 #include "kernel/kernel_math.h"
 #include "kernel/svm/svm_types.h"
 #include "util/util_static_assert.h"
@@ -25,11 +31,6 @@
 #  define __KERNEL_CPU__
 #endif
 
-#if defined(__KERNEL_CPU__) && defined(WITH_EMBREE)
-#include <embree3/rtcore.h>
-#include <embree3/rtcore_scene.h>
-#endif
-
 /* TODO(sergey): This is only to make it possible to include this header
  * from outside of the kernel. but this could be done somewhat cleaner?
  */
@@ -102,9 +103,6 @@ CCL_NAMESPACE_BEGIN
 #  define __SHADOW_RECORD_ALL__
 #  define __VOLUME_DECOUPLED__
 #  define __VOLUME_RECORD_ALL__
-#  ifdef WITH_EMBREE
-#    define __EMBREE__
-#  endif
 #endif  /* __KERNEL_CPU__ */
 
 #ifdef __KERNEL_CUDA__



More information about the Bf-blender-cvs mailing list