diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-16 21:08:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-16 23:05:04 +0400 |
| commit | 6f1afdbbfc4c25c74fbb470de09dc9b8b53497ca (patch) | |
| tree | 80dd440b6d851320aae29ad3780224d7f00ab7f5 | |
| parent | 2851ed4a553d633c3ccbfcbbec6a4c12b79401d9 (diff) | |
Cycles CUDA: enabled branched path kernel again, with more registers.
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 9200473825d..879ede1ffff 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -247,12 +247,6 @@ public: return false; } - /* Currently no Branched Path on sm_30 */ - if(branched) { - cuda_error_message(string_printf("CUDA device: Branched Path is currently disabled, due to compile errors.")); - return false; - } - return true; } diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index c2ddb0bda9b..6b14b3935e0 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -69,8 +69,7 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CUDA__ #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ -/* Disabled for now, compile errors */ -//#define __BRANCHED_PATH__ +#define __BRANCHED_PATH__ /* Experimental on GPU */ //#define __VOLUME__ |