diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 23:06:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-19 13:35:07 +0300 |
| commit | 0fe41009f095835bda961a67697b36cbc8cade49 (patch) | |
| tree | 5ac5379e8fb889f2dc4754043c76dfe2ba90c5d5 /intern/cycles/device/device_memory.cpp | |
| parent | 889321e22b70006a550c923c0ace18e75732e106 (diff) | |
Fix T53830: Cycles OpenCL debug assert on macOS,
This was probably harmless besides some unnecessary memory usage due to
aligning allocations too much.
Diffstat (limited to 'intern/cycles/device/device_memory.cpp')
| -rw-r--r-- | intern/cycles/device/device_memory.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp index 82598007a59..c6248fcf88b 100644 --- a/intern/cycles/device/device_memory.cpp +++ b/intern/cycles/device/device_memory.cpp @@ -50,8 +50,7 @@ void *device_memory::host_alloc(size_t size) return 0; } - size_t alignment = device->mem_address_alignment(); - void *ptr = util_aligned_malloc(size, alignment); + void *ptr = util_aligned_malloc(size, MIN_ALIGNMENT_CPU_DATA_TYPES); if(ptr) { util_guarded_mem_alloc(size); |