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_lamp_emission.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_lamp_emission.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_lamp_emission.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/split/kernel_lamp_emission.h b/intern/cycles/kernel/split/kernel_lamp_emission.h index f400a99e229..b804bfc8630 100644 --- a/intern/cycles/kernel/split/kernel_lamp_emission.h +++ b/intern/cycles/kernel/split/kernel_lamp_emission.h @@ -40,7 +40,7 @@ * * note : shader_data is neither input nor output. Its just filled and consumed in the same, kernel_lamp_emission, kernel. */ -ccl_device void kernel_lamp_emission( +__kernel void kernel_lamp_emission( ccl_global char *globals, ccl_constant KernelData *data, ccl_global char *shader_data, /* Required for lamp emission */ |