griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.90-release'

Browse Source
This commit is contained in:
Patrick Mours
2020-07-24 15:39:11 +02:00
parent 50ff450202 c64b12c0b8
commit 704d581aea
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/device/device_optix.cpp
View File

@@ -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;