[Bf-blender-cvs] [c2b9f78] master: Cycles: Pass __KERNEL_EXPERIMENTAL__ to OpenCL split kernels
Sergey Sharybin
noreply at git.blender.org
Fri May 15 10:23:58 CEST 2015
Commit: c2b9f784153f20b75444632ef3b57aa3b1597f31
Author: Sergey Sharybin
Date: Fri May 15 12:49:25 2015 +0500
Branches: master
https://developer.blender.org/rBc2b9f784153f20b75444632ef3b57aa3b1597f31
Cycles: Pass __KERNEL_EXPERIMENTAL__ to OpenCL split kernels
Experimental feature set id currently unavailable for megakernel, it'll
require some changes to the cache system to distinguish cached regular
kernels from cached experimental kernels.
Currently unused, but some features will be enabled soon.
===================================================================
M intern/cycles/device/device_opencl.cpp
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 05c8530..75d08cb 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2000,6 +2000,9 @@ public:
#ifdef __WORK_STEALING__
common_custom_build_options += "-D__WORK_STEALING__ ";
#endif
+ if(requested_features.experimental) {
+ common_custom_build_options += "-D__KERNEL_EXPERIMENTAL__ ";
+ }
#define LOAD_KERNEL(program, name) \
do { \
More information about the Bf-blender-cvs
mailing list