forked from bartvdbraak/blender
Cycles: Correction to opencl whitelist check
Was using platform as a device id accidentally.
This commit is contained in:
parent
1c02a201ba
commit
3a2c0ccdd0
@ -3364,22 +3364,22 @@ void device_opencl_info(vector<DeviceInfo>& devices)
|
|||||||
clGetPlatformInfo(platform_ids[platform], CL_PLATFORM_NAME, sizeof(pname), &pname, NULL);
|
clGetPlatformInfo(platform_ids[platform], CL_PLATFORM_NAME, sizeof(pname), &pname, NULL);
|
||||||
string platform_name = pname;
|
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 */
|
/* add devices */
|
||||||
for(int num = 0; num < num_devices; num++) {
|
for(int num = 0; num < num_devices; num++) {
|
||||||
cl_device_id device_id = device_ids[num];
|
cl_device_id device_id = device_ids[num];
|
||||||
char name[1024] = "\0";
|
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)
|
if(clGetDeviceInfo(device_id, CL_DEVICE_NAME, sizeof(name), &name, NULL) != CL_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user