[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40259] branches/cycles/intern/cycles/ device/device_opencl.cpp: Cycles: reenable opencl binary caching on mac, it 's not the cause of the problem.
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Sep 16 12:29:31 CEST 2011
Revision: 40259
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40259
Author: blendix
Date: 2011-09-16 10:29:30 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Cycles: reenable opencl binary caching on mac, it's not the cause of the problem.
Modified Paths:
--------------
branches/cycles/intern/cycles/device/device_opencl.cpp
Modified: branches/cycles/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/cycles/intern/cycles/device/device_opencl.cpp 2011-09-16 10:03:08 UTC (rev 40258)
+++ branches/cycles/intern/cycles/device/device_opencl.cpp 2011-09-16 10:29:30 UTC (rev 40259)
@@ -353,23 +353,19 @@
string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str());;
clbin = path_user_get(path_join("cache", clbin));
-#ifndef __APPLE__
if(path_exists(clbin)) {
/* if exists already, try use it */
if(!load_binary(kernel_path, clbin))
return false;
}
else {
-#endif
/* compile kernel */
if(!compile_kernel(kernel_path, kernel_md5))
return false;
-#ifndef __APPLE__
/* save binary for reuse */
save_binary(clbin);
}
-#endif
/* find kernels */
ckPathTraceKernel = clCreateKernel(cpProgram, "kernel_ocl_path_trace", &ciErr);
More information about the Bf-blender-cvs
mailing list