griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Disable Branched Path on all GPUs for now, until we separate the cubins.

Browse Source 
SM_20 fails now as well, reported by Zanqdo in IRC.
This commit is contained in:
Thomas Dinges
2014-04-03 22:18:11 +02:00
parent bd03e4cfe8
commit d923720312
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/device/device_cuda.cpp
View File

@@ -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;
}

8
intern/cycles/kernel/kernel_types.h
View File

@@ -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__