forked from bartvdbraak/blender
Cycles OpenCL: disable requirement of enabling Experimental, environment varibale
already adds an extra step. Also list all features for OpenCL AMD to make testing easier.
This commit is contained in:
parent
f4d3fdf288
commit
27b8ea476d
@ -1162,7 +1162,7 @@ def draw_device(self, context):
|
|||||||
device_type = context.user_preferences.system.compute_device_type
|
device_type = context.user_preferences.system.compute_device_type
|
||||||
if device_type == 'CUDA':
|
if device_type == 'CUDA':
|
||||||
layout.prop(cscene, "device")
|
layout.prop(cscene, "device")
|
||||||
elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
|
elif device_type == 'OPENCL':
|
||||||
layout.prop(cscene, "device")
|
layout.prop(cscene, "device")
|
||||||
|
|
||||||
if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'):
|
if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'):
|
||||||
|
@ -82,9 +82,20 @@ CCL_NAMESPACE_BEGIN
|
|||||||
#define __SVM__
|
#define __SVM__
|
||||||
#define __EMISSION__
|
#define __EMISSION__
|
||||||
#define __IMAGE_TEXTURES__
|
#define __IMAGE_TEXTURES__
|
||||||
#define __HOLDOUT__
|
|
||||||
#define __PROCEDURAL_TEXTURES__
|
#define __PROCEDURAL_TEXTURES__
|
||||||
#define __EXTRA_NODES__
|
#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
|
#endif
|
||||||
|
|
||||||
#ifdef __KERNEL_OPENCL_INTEL_CPU__
|
#ifdef __KERNEL_OPENCL_INTEL_CPU__
|
||||||
|
Loading…
Reference in New Issue
Block a user