diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-03 17:00:55 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-03 17:00:55 +0300 |
commit | 3aa74828ab627723e6c98163bf6344ef1f009bcf (patch) | |
tree | 7dbb827dbb794d8f71ecd4c8047a8d0fff272f6c /intern/cycles/util | |
parent | 87cbcd697b778b8c5500634a5193bdf67700b3a6 (diff) |
Cycles: Cleanup, indentation and braces
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_md5.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_ssef.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/util_md5.cpp index fec9605e409..19168135f01 100644 --- a/intern/cycles/util/util_md5.cpp +++ b/intern/cycles/util/util_md5.cpp @@ -141,7 +141,7 @@ void MD5Hash::process(const uint8_t *data /*[64]*/) X = xbuf; /* (dynamic only) */ for(i = 0; i < 16; ++i, xp += 4) - xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); + xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); } } diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/util_ssef.h index e625fa63568..2f5295b5463 100644 --- a/intern/cycles/util/util_ssef.h +++ b/intern/cycles/util/util_ssef.h @@ -558,7 +558,7 @@ ccl_device_inline const ssef shuffle_swap(const ssef& a, shuffle_swap_t shuf) #ifdef __KERNEL_SSE41__ ccl_device_inline void gen_idirsplat_swap(const ssef &pn, const shuffle_swap_t &shuf_identity, const shuffle_swap_t &shuf_swap, - const float3& idir, ssef idirsplat[3], shuffle_swap_t shufflexyz[3]) + const float3& idir, ssef idirsplat[3], shuffle_swap_t shufflexyz[3]) { const __m128 idirsplat_raw[] = { _mm_set_ps1(idir.x), _mm_set_ps1(idir.y), _mm_set_ps1(idir.z) }; idirsplat[0] = _mm_xor_ps(idirsplat_raw[0], pn); @@ -577,7 +577,7 @@ ccl_device_inline void gen_idirsplat_swap(const ssef &pn, const shuffle_swap_t & #else ccl_device_inline void gen_idirsplat_swap(const ssef &pn, const shuffle_swap_t &shuf_identity, const shuffle_swap_t &shuf_swap, - const float3& idir, ssef idirsplat[3], shuffle_swap_t shufflexyz[3]) + const float3& idir, ssef idirsplat[3], shuffle_swap_t shufflexyz[3]) { idirsplat[0] = ssef(idir.x) ^ pn; idirsplat[1] = ssef(idir.y) ^ pn; |