Commit: 82faf4644b9586501634d2ef77dc09e577fb4505
Author: varunsundar08
Date: Tue Apr 28 12:18:13 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rB82faf4644b9586501634d2ef77dc09e577fb4505
Bug fix : Remove __SPLIT_KERNEL__ build option for kernel.cl in
OpenCLDeviceSplitKernel
===================================================================
M intern/cycles/device/device_opencl.cpp
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp
b/intern/cycles/device/device_opencl.cpp
index b629693..a99c852 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2361,7 +2361,7 @@ public:
current_clos_max = clos_max;
kernel_init_source = "#include \"kernel.cl\" // " + kernel_md5
+ "\n";
- custom_kernel_build_options = "-D__SPLIT_KERNEL__ ";
+ custom_kernel_build_options = "";
device_md5 = device_md5_hash(custom_kernel_build_options);
clbin = string_printf("cycles_kernel_%s_%s.clbin",
device_md5.c_str(), kernel_md5.c_str());
if (!load_split_kernel(&cpProgram, kernel_path, "", device_md5,
kernel_init_source, clbin, custom_kernel_build_options))
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
