forked from bartvdbraak/blender
Cycles: Add an option to force disable all OpenCL devices
This way it's possible to disable OpenCL devices for AMD devices which are considered whitelisted.
This commit is contained in:
parent
0c14a897dd
commit
37539962fe
@ -77,6 +77,8 @@ cl_device_type opencl_device_type()
|
||||
char *device = getenv("CYCLES_OPENCL_TEST");
|
||||
|
||||
if(device) {
|
||||
if(strcmp(device, "NONE") == 0)
|
||||
return 0;
|
||||
if(strcmp(device, "ALL") == 0)
|
||||
return CL_DEVICE_TYPE_ALL;
|
||||
else if(strcmp(device, "DEFAULT") == 0)
|
||||
@ -211,6 +213,10 @@ void opencl_get_usable_devices(vector<OpenCLPlatformDevice> *usable_devices)
|
||||
(getenv("CYCLES_OPENCL_SPLIT_KERNEL_TEST")) != NULL;
|
||||
const cl_device_type device_type = opencl_device_type();
|
||||
|
||||
if(device_type == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
vector<cl_device_id> device_ids;
|
||||
cl_uint num_devices = 0;
|
||||
vector<cl_platform_id> platform_ids;
|
||||
@ -3480,6 +3486,9 @@ void device_opencl_info(vector<DeviceInfo>& devices)
|
||||
|
||||
string device_opencl_capabilities(void)
|
||||
{
|
||||
if(opencl_device_type() == 0) {
|
||||
return "All OpenCL devices are forced to be OFF";
|
||||
}
|
||||
string result = "";
|
||||
string error_msg = ""; /* Only used by opencl_assert(), but in the future
|
||||
* it could also be nicely reported to the console.
|
||||
|
Loading…
Reference in New Issue
Block a user