diff options
Diffstat (limited to 'intern/cycles/kernel/split/kernel_split_data.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_split_data.h | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/intern/cycles/kernel/split/kernel_split_data.h b/intern/cycles/kernel/split/kernel_split_data.h index 3f6b3977d79..433b1221a37 100644 --- a/intern/cycles/kernel/split/kernel_split_data.h +++ b/intern/cycles/kernel/split/kernel_split_data.h @@ -24,22 +24,22 @@ CCL_NAMESPACE_BEGIN ccl_device_inline uint64_t split_data_buffer_size(KernelGlobals *kg, size_t num_elements) { - (void) kg; /* Unused on CPU. */ + (void)kg; /* Unused on CPU. */ - uint64_t size = 0; -#define SPLIT_DATA_ENTRY(type, name, num) + align_up(num_elements * num * sizeof(type), 16) - size = size SPLIT_DATA_ENTRIES; + uint64_t size = 0; +#define SPLIT_DATA_ENTRY(type, name, num) +align_up(num_elements *num * sizeof(type), 16) + size = size SPLIT_DATA_ENTRIES; #undef SPLIT_DATA_ENTRY - uint64_t closure_size = sizeof(ShaderClosure) * (kernel_data.integrator.max_closures-1); + uint64_t closure_size = sizeof(ShaderClosure) * (kernel_data.integrator.max_closures - 1); #ifdef __BRANCHED_PATH__ - size += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); + size += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); #endif - size += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); + size += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); - return size; + return size; } ccl_device_inline void split_data_init(KernelGlobals *kg, @@ -48,28 +48,29 @@ ccl_device_inline void split_data_init(KernelGlobals *kg, ccl_global void *data, ccl_global char *ray_state) { - (void) kg; /* Unused on CPU. */ + (void)kg; /* Unused on CPU. */ - ccl_global char *p = (ccl_global char*)data; + ccl_global char *p = (ccl_global char *)data; #define SPLIT_DATA_ENTRY(type, name, num) \ - split_data->name = (type*)p; p += align_up(num_elements * num * sizeof(type), 16); - SPLIT_DATA_ENTRIES; + split_data->name = (type *)p; \ + p += align_up(num_elements * num * sizeof(type), 16); + SPLIT_DATA_ENTRIES; #undef SPLIT_DATA_ENTRY - uint64_t closure_size = sizeof(ShaderClosure) * (kernel_data.integrator.max_closures-1); + uint64_t closure_size = sizeof(ShaderClosure) * (kernel_data.integrator.max_closures - 1); #ifdef __BRANCHED_PATH__ - split_data->_branched_state_sd = (ShaderData*)p; - p += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); + split_data->_branched_state_sd = (ShaderData *)p; + p += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); #endif - split_data->_sd = (ShaderData*)p; - p += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); + split_data->_sd = (ShaderData *)p; + p += align_up(num_elements * (sizeof(ShaderData) + closure_size), 16); - split_data->ray_state = ray_state; + split_data->ray_state = ray_state; } CCL_NAMESPACE_END -#endif /* __KERNEL_SPLIT_DATA_H__ */ +#endif /* __KERNEL_SPLIT_DATA_H__ */ |