[Bf-blender-cvs] [6f1afdb] master: Cycles CUDA: enabled branched path kernel again, with more registers.

Brecht Van Lommel noreply at git.blender.org
Wed Apr 16 21:05:11 CEST 2014


Commit: 6f1afdbbfc4c25c74fbb470de09dc9b8b53497ca
Author: Brecht Van Lommel
Date:   Wed Apr 16 19:08:37 2014 +0200
https://developer.blender.org/rB6f1afdbbfc4c25c74fbb470de09dc9b8b53497ca

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

===================================================================

M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 9200473..879ede1 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 c2ddb0b..6b14b39 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__




More information about the Bf-blender-cvs mailing list