[Bf-blender-cvs] [d923720] master: Cycles: Disable Branched Path on all GPUs for now, until we separate the cubins.

[Thomas Dinges]

Commit: d9237203123ad44c8be67859d57174c7e7ca47ae
Author: Thomas Dinges
Date:   Thu Apr 3 22:18:11 2014 +0200
https://developer.blender.org/rBd9237203123ad44c8be67859d57174c7e7ca47ae

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.

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

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 26d356a..a5e4ec6 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 f01b173..1045b0a 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__