blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

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

This commit is contained in:
Stefan Werner 2018-11-07 15:20:24 +01:00
parent 33201a48b0
commit d3320c5488
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intern/cycles/kernel/kernel_types.h
View File

@ -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__