diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-12-17 12:54:36 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-12-17 12:59:18 +0400 |
| commit | 011ae788576449cb0eeeed67990050a6ba87bda2 (patch) | |
| tree | ec2c777834239d311577b1b6700a945b1172f4b1 /intern/cycles/device | |
| parent | 51f5c994e9f03ec2c488ac3a2af02b43c34d7ca6 (diff) | |
Cycles / OpenCL: Fix compile error on OS X
After update to Mac OS X 10.9.1, OpenCL works now on my Intel CPU in the 2013 Macbook Pro (even the entire kernel).
The Intel Iris Pro GPU still segfaults here though, even when all flags are disabled (building "clay like" kernel only).
Maybe we need the -no-missing-prototypes for AMD hardware still, but I couldn't find a way to distuinguish here.
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 98d3b07b7ee..3a88b68b292 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -86,7 +86,7 @@ static string opencl_kernel_build_options(const string& platform, const string * build_options += "-D__KERNEL_OPENCL_NVIDIA__ -cl-nv-maxrregcount=32 -cl-nv-verbose "; else if(platform == "Apple") - build_options += "-D__KERNEL_OPENCL_APPLE__ -Wno-missing-prototypes "; + build_options += "-D__KERNEL_OPENCL_APPLE__ "; else if(platform == "AMD Accelerated Parallel Processing") build_options += "-D__KERNEL_OPENCL_AMD__ "; |