blender
/
blender
130
398
Fork 575
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cycles: Fix re-definition of some functions on x32 arch

This commit is contained in:
Sergey Sharybin 2016-11-22 12:34:23 +01:00
parent 1be717d007
commit 4818b3c97e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/util/util_simd.h
View File

@ -229,7 +229,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__) || defined(__APPLE__)
#if (defined(__KERNEL_64_BIT__) || defined(__APPLE__)) && !(defined(__ILP32__) && defined(__x86_64__))
__forceinline size_t __bsf(size_t v) {
size_t r = 0; asm ("bsf %1,%0" : "=r"(r) : "r"(v)); return r;
}
@ -271,7 +271,7 @@ __forceinline unsigned int bitscan(unsigned int v) {
#endif
}
#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
#if (defined(__KERNEL_64_BIT__) || defined(__APPLE__)) && !(defined(__ILP32__) && defined(__x86_64__))
__forceinline size_t bitscan(size_t v) {
#if defined(__KERNEL_AVX2__)
#if defined(__KERNEL_64_BIT__)
@ -313,7 +313,7 @@ __forceinline unsigned int __bscf(unsigned int& v)
return i;
}
#if defined(__KERNEL_64_BIT__) || defined(__APPLE__)
#if (defined(__KERNEL_64_BIT__) || defined(__APPLE__)) && !(defined(__ILP32__) && defined(__x86_64__))
__forceinline size_t __bscf(size_t& v)
{
size_t i = bitscan(v);