diff options
author | Patrick Mours <pmours@nvidia.com> | 2020-07-24 16:39:11 +0300 |
---|---|---|
committer | Patrick Mours <pmours@nvidia.com> | 2020-07-24 16:39:11 +0300 |
commit | 704d581aea041b73d820ee33a9fb3e24cd24e70a (patch) | |
tree | cddb2a43c1849a634b558190dc90f9692d4ff64d | |
parent | 50ff45020288037169f499d373996d611c995c64 (diff) | |
parent | c64b12c0b80bc5a60ff39c7f984d06020009400c (diff) |
Merge branch 'blender-v2.90-release'
-rw-r--r-- | intern/cycles/device/device_optix.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 1cc45983565..ca10cee76ad 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -1746,10 +1746,11 @@ void device_optix_info(const vector<DeviceInfo> &cuda_devices, vector<DeviceInfo for (DeviceInfo info : cuda_devices) { assert(info.type == DEVICE_CUDA); - int major; + int major, minor; cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, info.num); - if (major < 5) { - continue; // Only Maxwell and up are supported by OptiX + cuDeviceGetAttribute(&minor, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, info.num); + if (major < 5 || (major == 5 && minor < 2)) { + continue; // Only Maxwell 2.0 and up are supported by OptiX } info.type = DEVICE_OPTIX; |