diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-02 18:41:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-02 18:41:04 +0400 |
| commit | cbb783f1d659263bbfd9924e74913e204a688077 (patch) | |
| tree | 47c0b4aec4d5cd0232be3bbdcb8fdcf2c764f713 /intern/cycles/kernel/kernel_film.h | |
| parent | 8e70db78f4e1c7c9b99cad709b347b3da92f442e (diff) | |
Fix cycles OpenCL compile error on AMD, and fix assert in debug builds.
Diffstat (limited to 'intern/cycles/kernel/kernel_film.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_film.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h index 8868a335037..721eceabc37 100644 --- a/intern/cycles/kernel/kernel_film.h +++ b/intern/cycles/kernel/kernel_film.h @@ -70,8 +70,8 @@ __device void kernel_film_convert_to_half_float(KernelGlobals *kg, /* buffer offset */ int index = offset + x + y*stride; - float4 *in = (float4*)(buffer + index*kernel_data.film.pass_stride); - half *out = (half*)rgba + index*4; + __global float4 *in = (__global float4*)(buffer + index*kernel_data.film.pass_stride); + __global half *out = (__global half*)rgba + index*4; float scale = kernel_data.film.exposure*sample_scale; float4_store_half(out, in, scale); |