From 56bf25d219b1e4960f2f105b988674aa14a1e41a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 15 Jul 2015 11:16:12 +0200 Subject: Cycles: Enable OpenCL rendering on Apple OSX Requires having latest El Capitan beta 3 OSX due to ome crucial fixes made in the compiler. Supports same features as NVidia OpenCL apart from CMJ (there's no experimental feature set support in megakernel yet). Uses megakernel internally, which works much better than the split kernel. Split kernel is not supported on OSX still, needs to be investigated still. Some more details can be found there: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles/OpenCL#AMD_on_OSX --- intern/cycles/device/device_opencl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'intern/cycles/device/device_opencl.cpp') diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 367c5f31984..8df83116195 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -115,12 +115,14 @@ bool opencl_kernel_use_advanced_shading(const string& platform) if(platform == "NVIDIA CUDA") return true; else if(platform == "Apple") - return false; + return true; else if(platform == "AMD Accelerated Parallel Processing") return true; else if(platform == "Intel(R) OpenCL") return true; - + /* Make sure officially unsupported OpenCL platforms + * does not set up to use advanced shading. + */ return false; } -- cgit v1.2.3