diff options
| author | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
|---|---|---|
| committer | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
| commit | dad3574a8c0b673efa9d7f7c890d9562e3f6a267 (patch) | |
| tree | 84dff4a90c34a44744c329de21a999289f9d209a /intern/cycles/util/defines.h | |
| parent | e9260afa93068d0181de6e3223f65e7bb016aecc (diff) | |
| parent | dc8a1d38b73420428f9fb878386b99ebb69dd841 (diff) | |
Merge branch 'master' into soc-2022-many-lights-sampling
Diffstat (limited to 'intern/cycles/util/defines.h')
| -rw-r--r-- | intern/cycles/util/defines.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/defines.h b/intern/cycles/util/defines.h index 1969529eff0..d5be14c8eba 100644 --- a/intern/cycles/util/defines.h +++ b/intern/cycles/util/defines.h @@ -23,6 +23,7 @@ /* Leave inlining decisions to compiler for these, the inline keyword here * is not about performance but including function definitions in headers. */ # define ccl_device static inline +# define ccl_device_extern extern "C" # define ccl_device_noinline static inline # define ccl_device_noinline_cpu ccl_device_noinline |