kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles OpenCL: disable requirement of enabling Experimental, environment varibale

Browse Source 
already adds an extra step. Also list all features for OpenCL AMD to make testing
easier.
This commit is contained in:
Brecht Van Lommel 2013-05-28 17:37:24 +00:00
parent f4d3fdf288
commit 27b8ea476d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/addon/ui.py
View 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'):

13
intern/cycles/kernel/kernel_types.h
View 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__