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-04-04 00:18:11 +0400
committerThomas Dinges <blender@dingto.org>2014-04-04 00:18:40 +0400
commitd9237203123ad44c8be67859d57174c7e7ca47ae (patch)
treeee320c3c3c9029a79200e29362029d986ad1bc8d /intern/cycles/device
parentbd03e4cfe8f1d8e4d706e126f59e6b8ddf3688c5 (diff)
Cycles: Disable Branched Path on all GPUs for now, until we separate the cubins.
SM_20 fails now as well, reported by Zanqdo in IRC.
Diffstat (limited to 'intern/cycles/device')
-rw-r--r--intern/cycles/device/device_cuda.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 26d356af458..a5e4ec63699 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -248,8 +248,8 @@ public:
}
/* Currently no Branched Path on sm_30 */
- if(branched && major == 3 && minor == 0) {
- cuda_error_message(string_printf("CUDA device: Branched Path is currently disabled on sm_30 GPUs."));
+ if(branched) {
+ cuda_error_message(string_printf("CUDA device: Branched Path is currently disabled, due to compile errors."));
return false;
}