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:
authorThomas Dinges <blender@dingto.org>2014-05-10 03:26:04 +0400
committerThomas Dinges <blender@dingto.org>2014-05-10 03:26:04 +0400
commitfd26a32aa5336b6c5fd3e8a9fc5fc618b2590bb1 (patch)
tree94fbf84e1e0897aabedb8bebe012ad35b837344b
parentd5588fd658dc0c776a33e55ccbfaed1a3974b396 (diff)
Fix T40119, CUDA Toolkit version mismatch
-rw-r--r--intern/cycles/device/device_cuda.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index c667b8863d6..9139a75ef3e 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -297,12 +297,11 @@ public:
return "";
}
if(cuda_version < 50) {
- printf("Unsupported CUDA version %d.%d detected, you need CUDA 5.0.\n", cuda_version/10, cuda_version%10);
+ printf("Unsupported CUDA version %d.%d detected, you need CUDA 6.0.\n", cuda_version/10, cuda_version%10);
return "";
}
-
- else if(cuda_version > 50)
- printf("CUDA version %d.%d detected, build may succeed but only CUDA 5.0 is officially supported.\n", cuda_version/10, cuda_version%10);
+ else if(cuda_version != 60)
+ printf("CUDA version %d.%d detected, build may succeed but only CUDA 6.0 is officially supported.\n", cuda_version/10, cuda_version%10);
/* compile */
string kernel = path_join(kernel_path, "kernel.cu");