Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-06-19 10:24:08 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-06-19 10:24:08 +0400
commit89ee6e08087dedd543da569a2ae0a4d64c43f368 (patch)
tree28c4eba96154d947589ac0627ffb6e1abe5be6a1 /intern
parent24723131ef2f1b3b2b1673060a35e64c3da181b3 (diff)
Cycles: attempt to solve compilation error on 32bit OSX
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_simd.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index 9b86e8be72e..39506a6359b 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -225,7 +225,7 @@ __forceinline int __btr(int v, int i) {
int r = 0; asm ("btr %1,%0" : "=r"(r) : "r"(i), "0"(v) : "flags"); return r;
}
-#if defined(__KERNEL_64_BIT__)
+#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
__forceinline size_t __bsf(size_t v) {
size_t r = 0; asm ("bsf %1,%0" : "=r"(r) : "r"(v)); return r;
}
@@ -267,7 +267,7 @@ __forceinline unsigned int bitscan(unsigned int v) {
#endif
}
-#if defined(__KERNEL_64_BIT__)
+#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
__forceinline size_t bitscan(size_t v) {
#if defined(__KERNEL_AVX2__)
#if defined(__KERNEL_64_BIT__)
@@ -309,7 +309,7 @@ __forceinline unsigned int __bscf(unsigned int& v)
return i;
}
-#if defined(__KERNEL_64_BIT__)
+#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
__forceinline size_t __bscf(size_t& v)
{
size_t i = bitscan(v);