Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles CUDA: enabled branched path kernel again, with more registers.

Browse Source
This commit is contained in:
Brecht Van Lommel
2014-04-16 19:08:37 +02:00
parent 2851ed4a55
commit 6f1afdbbfc
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,12 +247,6 @@ public:
return false; 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; return true;
} }

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

@@ -69,8 +69,7 @@ CCL_NAMESPACE_BEGIN
#ifdef __KERNEL_CUDA__ #ifdef __KERNEL_CUDA__
#define __KERNEL_SHADING__ #define __KERNEL_SHADING__
#define __KERNEL_ADV_SHADING__ #define __KERNEL_ADV_SHADING__
/* Disabled for now, compile errors */ #define __BRANCHED_PATH__
//#define __BRANCHED_PATH__
/* Experimental on GPU */ /* Experimental on GPU */
//#define __VOLUME__ //#define __VOLUME__