Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-05-14 22:42:05 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-05-14 22:42:05 +0300
commit03565218d5a85f06a26a1ac95e70991613faaf2a (patch)
tree97e0bd64be167e41b33bdf14ea0634cea215d4c8 /intern
parentf6c6dd44de766725e4409b8cae357817661b91fe (diff)
Cycles: Various fixes
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.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/device/device_opencl.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 9153aa32e60..81edd25f958 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -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);