diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-10 18:01:24 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-10 18:02:06 +0300 |
commit | 3a2c0ccdd0236bf26983f5e4d501f7bc234ed6c0 (patch) | |
tree | ee595775b47861c698f0152c7d4cd060ecdee296 | |
parent | 1c02a201ba992adc43ec9d9a08b121edfaec4232 (diff) |
Cycles: Correction to opencl whitelist check
Was using platform as a device id accidentally.
-rw-r--r-- | intern/cycles/device/device_opencl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index e342010567f..5657e3a5992 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -3364,22 +3364,22 @@ void device_opencl_info(vector<DeviceInfo>& devices) clGetPlatformInfo(platform_ids[platform], CL_PLATFORM_NAME, sizeof(pname), &pname, NULL); string platform_name = pname; - cl_device_type device_type; - clGetDeviceInfo(device_ids[platform], CL_DEVICE_TYPE, sizeof(cl_device_type), &device_type, NULL); - - /* TODO(sergey): Make it an utility function to check whitelisted devices. */ - if(!(force_all_platforms || - (platform_name == "AMD Accelerated Parallel Processing" && - device_type == CL_DEVICE_TYPE_GPU))) - { - continue; - } - /* add devices */ for(int num = 0; num < num_devices; num++) { cl_device_id device_id = device_ids[num]; char name[1024] = "\0"; + cl_device_type device_type; + clGetDeviceInfo(device_id, CL_DEVICE_TYPE, sizeof(cl_device_type), &device_type, NULL); + + /* TODO(sergey): Make it an utility function to check whitelisted devices. */ + if(!(force_all_platforms || + (platform_name == "AMD Accelerated Parallel Processing" && + device_type == CL_DEVICE_TYPE_GPU))) + { + continue; + } + if(clGetDeviceInfo(device_id, CL_DEVICE_NAME, sizeof(name), &name, NULL) != CL_SUCCESS) continue; |