[Bf-blender-cvs] [b406b7b] master: Cycles: Mark which CUDA device is used for display

[Sergey Sharybin]

Commit: b406b7be00ceeaa5910ff87a50c1dea11cd4e9d8
Author: Sergey Sharybin
Date:   Fri Jun 3 11:52:08 2016 +0200
Branches: master
https://developer.blender.org/rBb406b7be00ceeaa5910ff87a50c1dea11cd4e9d8

Cycles: Mark which CUDA device is used for display

It is really handy to know which one is display when having two cards of
same type in the machine.

===================================================================

M	intern/cycles/device/device_cuda.cpp

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index d7ed7b4..2d40491 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1368,6 +1368,7 @@ void device_cuda_info(vector<DeviceInfo>& devices)
 
 		/* if device has a kernel timeout, assume it is used for display */
 		if(cuDeviceGetAttribute(&attr, CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT, num) == CUDA_SUCCESS && attr == 1) {
+			info.description += " (Display)";
 			info.display_device = true;
 			display_devices.push_back(info);
 		}