From 0fe41009f095835bda961a67697b36cbc8cade49 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 18 Jan 2018 21:06:35 +0100 Subject: Fix T53830: Cycles OpenCL debug assert on macOS, This was probably harmless besides some unnecessary memory usage due to aligning allocations too much. --- intern/cycles/device/device.h | 2 +- intern/cycles/device/device_memory.cpp | 3 +-- intern/cycles/device/opencl/opencl_util.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'intern/cycles/device') diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 35b545388f2..528a6dc10f6 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -286,7 +286,7 @@ public: Stats &stats; /* memory alignment */ - virtual int mem_address_alignment() { return 16; } + virtual int mem_address_alignment() { return MIN_ALIGNMENT_CPU_DATA_TYPES; } /* constant memory */ virtual void const_copy_to(const char *name, void *host, size_t size) = 0; 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); diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index 459d512172f..47d099a1f94 100644 --- a/intern/cycles/device/opencl/opencl_util.cpp +++ b/intern/cycles/device/opencl/opencl_util.cpp @@ -1137,14 +1137,14 @@ bool OpenCLInfo::get_driver_version(cl_device_id device_id, int OpenCLInfo::mem_address_alignment(cl_device_id device_id) { - int base_align_bits; + int base_align_bytes; if(clGetDeviceInfo(device_id, - CL_DEVICE_MEM_BASE_ADDR_ALIGN, + CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE, sizeof(int), - &base_align_bits, + &base_align_bytes, NULL) == CL_SUCCESS) { - return base_align_bits/8; + return base_align_bytes; } return 1; } -- cgit v1.2.3