Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-26 23:07:01 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-26 23:07:01 +0400
commit803286dde8dd9594a6a8c9e1ed154863934da295 (patch)
treef04c73fd252d79ad73340b59d89c30c40bc58f20 /intern/cycles/device/device_cuda.cpp
parent4514a4455be89bc0a789d78355321abe6cfd5112 (diff)
Cycles: render passes for CUDA cards with compute model >= 2.x.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
-rw-r--r--intern/cycles/device/device_cuda.cpp24
1 files changed, 4 insertions, 20 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 55b467fc856..14bcaa94130 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -194,26 +194,6 @@ public:
cuda_assert(cuCtxDetach(cuContext))
}
- bool support_full_kernel()
- {
- int major, minor;
- cuDeviceComputeCapability(&major, &minor, cuDevId);
-
- return (major >= 2);
- }
-
- string description()
- {
- /* print device information */
- char deviceName[256];
-
- cuda_push_context();
- cuDeviceGetName(deviceName, 256, cuDevId);
- cuda_pop_context();
-
- return string("CUDA ") + deviceName;
- }
-
bool support_device(bool experimental)
{
if(!experimental) {
@@ -881,6 +861,10 @@ void device_cuda_info(vector<DeviceInfo>& devices)
info.id = string_printf("CUDA_%d", num);
info.num = num;
+ int major, minor;
+ cuDeviceComputeCapability(&major, &minor, num);
+ info.advanced_shading = (major >= 2);
+
/* 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.display_device = true;