[Bf-blender-cvs] [63dd554] master: Cycles: Don't show pre-sm_20 CUDA cards in the device list
Sergey Sharybin
noreply at git.blender.org
Sat Jun 20 17:34:45 CEST 2015
Commit: 63dd554ff12ee6a83758e67152bfeabaffe670d0
Author: Sergey Sharybin
Date: Sat Jun 20 17:34:12 2015 +0200
Branches: master
https://developer.blender.org/rB63dd554ff12ee6a83758e67152bfeabaffe670d0
Cycles: Don't show pre-sm_20 CUDA cards in the device list
===================================================================
M intern/cycles/device/device_cuda.cpp
===================================================================
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index eb861d7..3607de5 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1122,23 +1122,28 @@ void device_cuda_info(vector<DeviceInfo>& devices)
}
vector<DeviceInfo> display_devices;
-
+
+ int num_devices = 0;
for(int num = 0; num < count; num++) {
char name[256];
int attr;
-
+
if(cuDeviceGetName(name, 256, num) != CUDA_SUCCESS)
continue;
+ int major, minor;
+ cuDeviceComputeCapability(&major, &minor, num);
+ if(major < 2) {
+ continue;
+ }
+
DeviceInfo info;
info.type = DEVICE_CUDA;
info.description = string(name);
info.id = string_printf("CUDA_%d", num);
- info.num = num;
+ info.num = num_devices;
- int major, minor;
- cuDeviceComputeCapability(&major, &minor, num);
info.advanced_shading = (major >= 2);
info.extended_images = (major >= 3);
info.pack_images = false;
@@ -1150,6 +1155,8 @@ void device_cuda_info(vector<DeviceInfo>& devices)
}
else
devices.push_back(info);
+
+ ++num_devices;
}
if(!display_devices.empty())
More information about the Bf-blender-cvs
mailing list