Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Various fixes

Browse Source 
Some stupid fixes like spaces around operator and missing semicolon,
plus fix for wrong detecting of ShaderData SOA size. Thar was harmless
since there's only one closure array, but still better to fix this.
This commit is contained in:
Sergey Sharybin
2015-05-15 00:42:05 +05:00
parent f6c6dd44de
commit 03565218d5
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/device/device_opencl.cpp
View File

@@ -1867,7 +1867,7 @@ public:
size_t get_shader_closure_size(int max_closure)
{
return (sizeof(ShaderClosure)* max_closure);
return (sizeof(ShaderClosure) * max_closure);
}
size_t get_shader_data_size(size_t shader_closure_size)
@@ -1900,10 +1900,8 @@ public:
{
size_t shader_soa_size = 0;
#define SD_VAR(type, what) \
shader_soa_size += sizeof(void *);
#define SD_CLOSURE_VAR(type, what, max_closure)
shader_soa_size += sizeof(void *);
#define SD_VAR(type, what) shader_soa_size += sizeof(void *);
#define SD_CLOSURE_VAR(type, what, max_closure) shader_soa_size += sizeof(void *);
#include "kernel_shaderdata_vars.h"
#undef SD_VAR
#undef SD_CLOSURE_VAR
@@ -2215,7 +2213,7 @@ public:
*/
if(num_parallel_samples >= 64) {
/* TODO(sergey): Could use generic round-up here. */
num_parallel_samples = (num_parallel_samples / 64) * 64
num_parallel_samples = (num_parallel_samples / 64) * 64;
}
assert(num_parallel_samples != 0);