sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix: cycles crash with multiple OpenCL platforms installed, tracked down by Sergey.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-02-20 14:19:34 +00:00
parent 5c14048600
commit dc181ea7e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/device/device_opencl.cpp
View File

@ -165,7 +165,7 @@ public:
return;
}
ciErr = clGetPlatformIDs(num_platforms, &cpPlatform, NULL);
ciErr = clGetPlatformIDs(1, &cpPlatform, NULL);
if(opencl_error(ciErr))
return;
@ -709,7 +709,7 @@ void device_opencl_info(vector<DeviceInfo>& devices)
if(clGetPlatformIDs(0, NULL, &num_platforms) != CL_SUCCESS || num_platforms == 0)
return;
if(clGetPlatformIDs(num_platforms, &platform_id, NULL) != CL_SUCCESS)
if(clGetPlatformIDs(1, &platform_id, NULL) != CL_SUCCESS)
return;
if(clGetDeviceIDs(platform_id, CL_DEVICE_TYPE_GPU|CL_DEVICE_TYPE_ACCELERATOR, 0, NULL, &num_devices) != CL_SUCCESS)