From 3c4df13924a86355a16774e44b6c5e126001c979 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 20 Mar 2017 15:37:05 +0100 Subject: Fix T50268: Cycles allows to select un supported GPUs for OpenCL --- intern/cycles/device/opencl/opencl_util.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index a689c7eae26..52f8a77c09e 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) { -- cgit v1.2.3