diff options
| author | Michael Jones <michael_p_jones@apple.com> | 2021-11-18 16:25:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-18 16:38:02 +0300 |
| commit | d19e35873f67c90b251ca38e007a83aa1eada211 (patch) | |
| tree | 7e8659acea7f12b188077ada225e113b5df35e60 /intern/cycles/kernel/film | |
| parent | c0d52db783eb3a6288c9af04298b2358fec76357 (diff) | |
Cycles: several small fixes and additions for MSL
This patch contains many small leftover fixes and additions that are
required for Metal-enablement:
- Address space fixes and a few other small compile fixes
- Addition of missing functionality to the Metal adapter headers
- Addition of various scattered `__KERNEL_METAL__` blocks (e.g. for
atomic support & maths functions)
Ref T92212
Differential Revision: https://developer.blender.org/D13263
Diffstat (limited to 'intern/cycles/kernel/film')
| -rw-r--r-- | intern/cycles/kernel/film/accumulate.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/film/accumulate.h b/intern/cycles/kernel/film/accumulate.h index c9303088e3f..9ee0d27cc8c 100644 --- a/intern/cycles/kernel/film/accumulate.h +++ b/intern/cycles/kernel/film/accumulate.h @@ -160,7 +160,8 @@ ccl_device_inline int kernel_accum_sample(KernelGlobals kg, ccl_global float *buffer = kernel_accum_pixel_render_buffer(kg, state, render_buffer); - return atomic_fetch_and_add_uint32((uint *)(buffer) + kernel_data.film.pass_sample_count, 1) + + return atomic_fetch_and_add_uint32( + (ccl_global uint *)(buffer) + kernel_data.film.pass_sample_count, 1) + sample_offset; } |