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

2014-04-16 19:08:37 +02:00
parent 2851ed4a55
commit 6f1afdbbfc
2 changed files with 1 additions and 8 deletions
--- 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;
 	}

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