Cycles OpenCL: disable requirement of enabling Experimental, environment varibale
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 28 May 2013 17:37:24 +0000 (17:37 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 28 May 2013 17:37:24 +0000 (17:37 +0000)
already adds an extra step. Also list all features for OpenCL AMD to make testing
easier.

intern/cycles/blender/addon/ui.py
intern/cycles/kernel/kernel_types.h

index d33422050a02a86a67f60209935381c5d40cfd2d..9218e2ecf7ba4a209585bf54e520a89d8c0c2647 100644 (file)
@@ -1162,7 +1162,7 @@ def draw_device(self, context):
         device_type = context.user_preferences.system.compute_device_type
         if device_type == 'CUDA':
             layout.prop(cscene, "device")
-        elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
+        elif device_type == 'OPENCL':
             layout.prop(cscene, "device")
 
         if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'):
index 96fb17282e5f5f43b21d00bb1156729aa498919f..85a4971e8bd9934ac48832cbd89c710e6417d4f5 100644 (file)
@@ -82,9 +82,20 @@ CCL_NAMESPACE_BEGIN
 #define __SVM__
 #define __EMISSION__
 #define __IMAGE_TEXTURES__
-#define __HOLDOUT__
 #define __PROCEDURAL_TEXTURES__
 #define __EXTRA_NODES__
+#define __HOLDOUT__
+#define __NORMAL_MAP__
+//#define __BACKGROUND_MIS__
+//#define __LAMP_MIS__
+//#define __AO__
+//#define __ANISOTROPIC__
+//#define __CAMERA_MOTION__
+//#define __OBJECT_MOTION__
+//#define __HAIR__
+//#define __MULTI_CLOSURE__
+//#define __TRANSPARENT_SHADOWS__
+//#define __PASSES__
 #endif
 
 #ifdef __KERNEL_OPENCL_INTEL_CPU__