diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-27 22:15:15 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-27 22:15:15 +0300 |
commit | 5ff132182dbb089111cba3a80fa3a8eeb6009ec3 (patch) | |
tree | 016387c6917ce51dbe405489f7f5846b19faab1f /intern/cycles/util | |
parent | 6f43e1dfef3e5632976529a6f678292b15bd5a0c (diff) |
Cycles: Code cleanup, spaces around keywords
This inconsistency drove me totally crazy, it's really confusing
when it's inconsistent especially when you work on both Cycles and
Blender sides.
Shouldn;t cause merge PITA, it's whitespace changes only, Git should
be able to merge it nicely.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_aligned_malloc.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_atomic.h | 4 | ||||
-rw-r--r-- | intern/cycles/util/util_hash.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_math.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_simd.h | 6 | ||||
-rw-r--r-- | intern/cycles/util/util_time.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/util/util_aligned_malloc.cpp b/intern/cycles/util/util_aligned_malloc.cpp index 9ff857e3543..b161a55c15e 100644 --- a/intern/cycles/util/util_aligned_malloc.cpp +++ b/intern/cycles/util/util_aligned_malloc.cpp @@ -55,7 +55,7 @@ void *util_aligned_malloc(size_t size, int alignment) return malloc(size); #elif defined(__FreeBSD__) || defined(__NetBSD__) void *result; - if (posix_memalign(&result, alignment, size)) { + if(posix_memalign(&result, alignment, size)) { /* Non-zero means allocation error * either no allocation or bad alignment value. */ diff --git a/intern/cycles/util/util_atomic.h b/intern/cycles/util/util_atomic.h index 7bbd97b8667..fa0d35e1034 100644 --- a/intern/cycles/util/util_atomic.h +++ b/intern/cycles/util/util_atomic.h @@ -23,8 +23,8 @@ ATOMIC_INLINE void atomic_update_max_z(size_t *maximum_value, size_t value) { size_t prev_value = *maximum_value; - while (prev_value < value) { - if (atomic_cas_z(maximum_value, prev_value, value) != prev_value) { + while(prev_value < value) { + if(atomic_cas_z(maximum_value, prev_value, value) != prev_value) { break; } } diff --git a/intern/cycles/util/util_hash.h b/intern/cycles/util/util_hash.h index bbbedc22a47..3ff2802b46d 100644 --- a/intern/cycles/util/util_hash.h +++ b/intern/cycles/util/util_hash.h @@ -53,7 +53,7 @@ static inline uint hash_string(const char *str) { uint i = 0, c; - while ((c = *str++)) + while((c = *str++)) i = i * 37 + c; return i; diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index a4d49681a38..6208608a233 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -1461,7 +1461,7 @@ ccl_device_inline float2 map_to_tube(const float3 co) { float len, u, v; len = sqrtf(co.x * co.x + co.y * co.y); - if (len > 0.0f) { + if(len > 0.0f) { u = (1.0f - (atan2f(co.x / len, co.y / len) / M_PI_F)) * 0.5f; v = (co.x + 1.0f) * 0.5f; } diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h index 625f26c1316..7c15199d4e1 100644 --- a/intern/cycles/util/util_simd.h +++ b/intern/cycles/util/util_simd.h @@ -133,7 +133,7 @@ __forceinline int clz(const int x) #if defined(__KERNEL_AVX2__) return _lzcnt_u32(x); #else - if (UNLIKELY(x == 0)) return 32; + if(UNLIKELY(x == 0)) return 32; return 31 - __bsr(x); #endif } @@ -286,7 +286,7 @@ __forceinline int clz(const int x) #if defined(__KERNEL_AVX2__) return _lzcnt_u32(x); #else - if (UNLIKELY(x == 0)) return 32; + if(UNLIKELY(x == 0)) return 32; return 31 - __bsr(x); #endif } @@ -358,7 +358,7 @@ __forceinline __m128i _mm_mullo_epi32( __m128i value, __m128i input ) { char* _r = (char*)(&rvalue + 1); char* _v = (char*)(& value + 1); char* _i = (char*)(& input + 1); - for ( ssize_t i = -16 ; i != 0 ; i += 4 ) *((int32*)(_r + i)) = *((int32*)(_v + i))* *((int32*)(_i + i)); + for( ssize_t i = -16 ; i != 0 ; i += 4 ) *((int32*)(_r + i)) = *((int32*)(_v + i))* *((int32*)(_i + i)); return rvalue; } diff --git a/intern/cycles/util/util_time.cpp b/intern/cycles/util/util_time.cpp index 9668b0f9882..964f9f1a7af 100644 --- a/intern/cycles/util/util_time.cpp +++ b/intern/cycles/util/util_time.cpp @@ -71,7 +71,7 @@ void time_sleep(double t) /* get microseconds */ int us = (int)(t * 1e6); - if (us > 0) + if(us > 0) usleep(us); } |