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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-20 00:51:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-20 00:53:19 +0300
commit19adfd3176966cbe72f55f68bf28b04e41e96e09 (patch)
tree6ecbfae4dc6aa3261c77acc3166ca86f3279cc0d /intern/cycles/device/device_opencl.cpp
parent52e34ffe333e1de83540555b6fcf2ff2b4532bc8 (diff)
Cycles: Fix OpenCL kernel compilation after the bake commit
There is no function pointers in OpenCL specification. For as long as we want to support this platform we should follow the specifications. While the code is not totally optimal now, it should not be that huge of performance issue on CPU since it does jump tables just nicely, so it's not that much extra computation here.
Diffstat (limited to 'intern/cycles/device/device_opencl.cpp')
-rw-r--r--intern/cycles/device/device_opencl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 6e2365d7831..3c07ddd3bcb 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1338,7 +1338,7 @@ public:
}
#define KERNEL_TEX(type, ttype, name) \
- set_kernel_arg_mem(kernel, &start_arg_index, #name);
+ set_kernel_arg_mem(kernel, &start_arg_index, #name);
#include "kernel_textures.h"
#undef KERNEL_TEX
@@ -1347,6 +1347,7 @@ public:
d_shader_eval_type);
if(task.shader_eval_type >= SHADER_EVAL_BAKE) {
start_arg_index += kernel_set_args(kernel,
+ start_arg_index,
d_shader_filter);
}
start_arg_index += kernel_set_args(kernel,