diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-18 17:19:16 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-18 17:19:16 +0400 |
| commit | 484d765bd49e0b7a3370280f5f3b9dac89e5f699 (patch) | |
| tree | 6acf41f68cef0be38aedf2e2240258219dd79b71 /intern/cycles/kernel/kernel_jitter.h | |
| parent | 5fc1d9205afc899aa7a3e6d6cffe3ed9deb88eb7 (diff) | |
Cycles: attempt to fix internal compile error with some visual studio builds
Diffstat (limited to 'intern/cycles/kernel/kernel_jitter.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_jitter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_jitter.h b/intern/cycles/kernel/kernel_jitter.h index 15d2151228f..17704b48cee 100644 --- a/intern/cycles/kernel/kernel_jitter.h +++ b/intern/cycles/kernel/kernel_jitter.h @@ -37,7 +37,7 @@ __device_inline int cmj_fast_mod_pow2(int a, int b) /* a must be > 0 and b must be > 1 */ __device_inline int cmj_fast_div_pow2(int a, int b) { -#ifdef __KERNEL_SSE2__ +#if defined(__KERNEL_SSE2__) && !defined(_MSC_VER) return a >> __builtin_ctz(b); #else return a/b; @@ -46,7 +46,7 @@ __device_inline int cmj_fast_div_pow2(int a, int b) __device_inline uint cmj_w_mask(uint w) { -#ifdef __KERNEL_SSE2__ +#if defined(__KERNEL_SSE2__) && !defined(_MSC_VER) return ((1 << (32 - __builtin_clz(w))) - 1); #else w |= w >> 1; |