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/device/hip/compat.h | |
| 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/device/hip/compat.h')
| -rw-r--r-- | intern/cycles/kernel/device/hip/compat.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/kernel/device/hip/compat.h b/intern/cycles/kernel/device/hip/compat.h index b58179e12ff..39bf2131c22 100644 --- a/intern/cycles/kernel/device/hip/compat.h +++ b/intern/cycles/kernel/device/hip/compat.h @@ -85,7 +85,6 @@ typedef unsigned long long uint64_t; #define ccl_gpu_syncthreads() __syncthreads() #define ccl_gpu_ballot(predicate) __ballot(predicate) #define ccl_gpu_shfl_down_sync(mask, var, detla) __shfl_down(var, detla) -#define ccl_gpu_popc(x) __popc(x) /* GPU texture objects */ typedef hipTextureObject_t ccl_gpu_tex_object; |