diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-05-25 02:02:06 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-05-25 02:02:06 +0300 |
| commit | a3ef51bba5f0494f5ff87acf52222c3f48eb3684 (patch) | |
| tree | 0dc36fa9609ac70713ea61a348c49c99570e5939 /intern/cycles/kernel/split/kernel_data_init.h | |
| parent | c3ab5b3089ef79ea345a5bc836346f685aecf29c (diff) | |
Fix T44833, OpenCL compile error on AMD.
This was broken after the kernel file restructure.
Variables allocated in the __local address space can only be defined
inside a __kernel function.
We probably need to solve this a bit differently once we do the CUDA
kernel split, but this fix shoud be good enough until then.
Diffstat (limited to 'intern/cycles/kernel/split/kernel_data_init.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_data_init.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h index b7a4d847d03..006f2c8e4df 100644 --- a/intern/cycles/kernel/split/kernel_data_init.h +++ b/intern/cycles/kernel/split/kernel_data_init.h @@ -51,7 +51,7 @@ * All slots in queues are initialized to queue empty slot; * The number of elements in the queues is initialized to 0; */ -ccl_device void kernel_data_init( +__kernel void kernel_data_init( ccl_global char *globals, ccl_global char *shader_data_sd, /* Arguments related to ShaderData */ ccl_global char *shader_data_sd_DL_shadow, /* Arguments related to ShaderData */ |