diff options
Diffstat (limited to 'intern/cycles/util/util_types.h')
| -rw-r--r-- | intern/cycles/util/util_types.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 535048d8f8c..48e9983ac8f 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -74,31 +74,31 @@ typedef int64_t ssize_t; # else typedef int32_t ssize_t; # endif -# endif /* _WIN32 */ +# endif /* _WIN32 */ /* Generic Memory Pointer */ typedef uint64_t device_ptr; -#endif /* __KERNEL_GPU__ */ +#endif /* __KERNEL_GPU__ */ ccl_device_inline size_t align_up(size_t offset, size_t alignment) { - return (offset + alignment - 1) & ~(alignment - 1); + return (offset + alignment - 1) & ~(alignment - 1); } ccl_device_inline size_t divide_up(size_t x, size_t y) { - return (x + y - 1) / y; + return (x + y - 1) / y; } ccl_device_inline size_t round_up(size_t x, size_t multiple) { - return ((x + multiple - 1) / multiple) * multiple; + return ((x + multiple - 1) / multiple) * multiple; } ccl_device_inline size_t round_down(size_t x, size_t multiple) { - return (x / multiple) * multiple; + return (x / multiple) * multiple; } CCL_NAMESPACE_END @@ -150,10 +150,10 @@ CCL_NAMESPACE_END # include "util/util_sseb.h" # include "util/util_ssei.h" # include "util/util_ssef.h" -#if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__) -# include "util/util_avxb.h" -# include "util/util_avxf.h" -#endif +# if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__) +# include "util/util_avxb.h" +# include "util/util_avxf.h" +# endif #endif -#endif /* __UTIL_TYPES_H__ */ +#endif /* __UTIL_TYPES_H__ */ |