diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-26 22:10:48 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-26 22:11:06 +0400 |
| commit | e827d904ae36a1b260ca2bfb04df23077edf66f4 (patch) | |
| tree | e85e7e465b617ccebe00ab58f8f0b25378f0321d /intern/cycles | |
| parent | db844959d18e21e8fbb6f1f3a425b757d0dcb05b (diff) | |
Move include outside of the CCL namespace
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_jitter.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_jitter.h b/intern/cycles/kernel/kernel_jitter.h index 15fd1da9426..3b68b1108ab 100644 --- a/intern/cycles/kernel/kernel_jitter.h +++ b/intern/cycles/kernel/kernel_jitter.h @@ -14,6 +14,11 @@ * limitations under the License */ +/* TODO(sergey): Consider moving portable ctz/clz stuff to util. */ +#ifdef _MSC_VER +# include <intrin.h> +#endif + CCL_NAMESPACE_BEGIN /* "Correlated Multi-Jittered Sampling" @@ -22,11 +27,6 @@ CCL_NAMESPACE_BEGIN /* todo: find good value, suggested 64 gives pattern on cornell box ceiling */ #define CMJ_RANDOM_OFFSET_LIMIT 4096 -/* TODO(sergey): Consider moving portable ctz/clz stuff to util. */ -#ifdef _MSC_VER -# include <intrin.h> -#endif - ccl_device_inline bool cmj_is_pow2(int i) { return (i & (i - 1)) == 0; |