[Bf-blender-cvs] [011ae78] master: Cycles / OpenCL: Fix compile error on OS X

[Thomas Dinges]

Commit: 011ae788576449cb0eeeed67990050a6ba87bda2
Author: Thomas Dinges
Date:   Tue Dec 17 09:54:36 2013 +0100
http://developer.blender.org/rB011ae788576449cb0eeeed67990050a6ba87bda2

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.

===================================================================

M	intern/cycles/device/device_opencl.cpp

===================================================================

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 98d3b07..3a88b68 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__ ";