[Bf-blender-cvs] [3c4df13924] master: Fix T50268: Cycles allows to select un supported GPUs for OpenCL

[Sergey Sharybin]

Commit: 3c4df13924a86355a16774e44b6c5e126001c979
Author: Sergey Sharybin
Date:   Mon Mar 20 15:37:05 2017 +0100
Branches: master
https://developer.blender.org/rB3c4df13924a86355a16774e44b6c5e126001c979

Fix T50268: Cycles allows to select un supported GPUs for OpenCL

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

M	intern/cycles/device/opencl/opencl_util.cpp

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

diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp
index a689c7eae2..52f8a77c09 100644
--- a/intern/cycles/device/opencl/opencl_util.cpp
+++ b/intern/cycles/device/opencl/opencl_util.cpp
@@ -605,6 +605,19 @@ bool OpenCLInfo::device_supported(const string& platform_name,
 	                sizeof(cl_device_type),
 	                &device_type,
 	                NULL);
+	char device_name[1024] = "\0";
+	clGetDeviceInfo(device_id,
+	                CL_DEVICE_NAME,
+	                sizeof(device_name),
+	                &device_name,
+	                NULL);
+	/* It is possible tyo have Iris GPU on AMD/Apple OpenCL framework
+	 * (aka, it will not be on Intel framework). This isn't supported
+	 * and needs an explicit blacklist.
+	 */
+	if(strstr(device_name, "Iris")) {
+		return false;
+	}
 	if(platform_name == "AMD Accelerated Parallel Processing" &&
 	   device_type == CL_DEVICE_TYPE_GPU)
 	{