diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-04-04 00:18:11 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-04-04 00:18:40 +0400 |
| commit | d9237203123ad44c8be67859d57174c7e7ca47ae (patch) | |
| tree | ee320c3c3c9029a79200e29362029d986ad1bc8d /intern/cycles | |
| parent | bd03e4cfe8f1d8e4d706e126f59e6b8ddf3688c5 (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')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 8 |
2 files changed, 7 insertions, 5 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; } diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index f01b173269c..1045b0add73 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -69,10 +69,12 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CUDA__ #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ -#if __CUDA_ARCH__ != 300 -#define __BRANCHED_PATH__ -#endif +/* Disabled for now, compile errors */ +//#define __BRANCHED_PATH__ + +/* Experimental on GPU */ //#define __VOLUME__ +//#define __SUBSURFACE__ #endif #ifdef __KERNEL_OPENCL__ |