Commit: fffb28578c9f7b3e1523970a5c656aa6cde108df
Author: Thomas Dinges
Date: Wed Apr 15 22:41:23 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rBfffb28578c9f7b3e1523970a5c656aa6cde108df
Fix OpenCL on Apple again, double spaces in compile arguments.
===================================================================
M intern/cycles/device/device_opencl.cpp
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp
b/intern/cycles/device/device_opencl.cpp
index f901fb0..b9644a4 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1606,73 +1606,73 @@ public:
kernel_init_source = "#include \"kernel_DataInit.cl\" // " +
kernel_md5 + "\n";
device_md5 = device_md5_hash("");
clbin = string_printf("cycles_kernel_%s_%s_DataInit.clbin",
device_md5.c_str(), kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&dataInit_program,
kernel_path, "dataInit", device_md5, kernel_init_source, clbin, "
-D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&dataInit_program,
kernel_path, "dataInit", device_md5, kernel_init_source, clbin,
"-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include \"kernel_SceneIntersect.cl\" //
" + kernel_md5 + "\n";
device_md5 = device_md5_hash("");
clbin =
string_printf("cycles_kernel_%s_%s_SceneIntersect.clbin", device_md5.c_str(),
kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&sceneIntersect_program,
kernel_path, "SceneIntersect", device_md5, kernel_init_source, clbin, "
-D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&sceneIntersect_program,
kernel_path, "SceneIntersect", device_md5, kernel_init_source, clbin,
"-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include \"kernel_LampEmission.cl\" // "
+ kernel_md5 + "\n";
device_md5 = device_md5_hash(svm_build_options);
clbin = string_printf("cycles_kernel_%s_%s_LampEmission.clbin",
device_md5.c_str(), kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&lampEmission_program,
kernel_path, "LampEmission", device_md5, kernel_init_source, clbin,
svm_build_options + " -D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&lampEmission_program,
kernel_path, "LampEmission", device_md5, kernel_init_source, clbin,
svm_build_options + "-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include \"kernel_QueueEnqueue.cl\" // "
+ kernel_md5 + "\n";
device_md5 = device_md5_hash("");
clbin = string_printf("cycles_kernel_%s_%s_QueueEnqueue.clbin",
device_md5.c_str(), kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&QueueEnqueue_program,
kernel_path, "Queue", device_md5, kernel_init_source, clbin, "
-D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&QueueEnqueue_program,
kernel_path, "Queue", device_md5, kernel_init_source, clbin,
"-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include
\"kernel_Background_BufferUpdate.cl\" // " + kernel_md5 + "\n";
device_md5 = device_md5_hash(svm_build_options);
clbin =
string_printf("cycles_kernel_%s_%s_Background_BufferUpdate.clbin",
device_md5.c_str(), kernel_md5.c_str());
-
if(!load_split_kernel_SPLIT_KERNEL(&background_BufferUpdate_program,
kernel_path, "Background", device_md5, kernel_init_source, clbin,
svm_build_options + " -D__SPLIT_KERNEL__ "))
+
if(!load_split_kernel_SPLIT_KERNEL(&background_BufferUpdate_program,
kernel_path, "Background", device_md5, kernel_init_source, clbin,
svm_build_options + "-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include \"kernel_ShaderEval.cl\" // " +
kernel_md5 + "\n";
device_md5 = device_md5_hash(svm_build_options);
clbin = string_printf("cycles_kernel_%s_%s_ShaderEval.clbin",
device_md5.c_str(), kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&shaderEval_program,
kernel_path, "shaderEval", device_md5, kernel_init_source, clbin,
svm_build_options + " -D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&shaderEval_program,
kernel_path, "shaderEval", device_md5, kernel_init_source, clbin,
svm_build_options + "-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include
\"kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl\" // "+ kernel_md5 +
"\n";
device_md5 = device_md5_hash("");
clbin =
string_printf("cycles_kernel_%s_%s_Holdout_Emission_Blurring_Pathtermination_AO.clbin",
device_md5.c_str(), kernel_md5.c_str());
-
if(!load_split_kernel_SPLIT_KERNEL(&holdout_emission_blurring_termination_ao_program,
kernel_path, "ao", device_md5, kernel_init_source, clbin, " -D__SPLIT_KERNEL__
"))
+
if(!load_split_kernel_SPLIT_KERNEL(&holdout_emission_blurring_termination_ao_program,
kernel_path, "ao", device_md5, kernel_init_source, clbin, "-D__SPLIT_KERNEL__
"))
return false;
#ifdef __SUBSURFACE__
kernel_init_source = "#include \"kernel_Subsurface.cl\" // " +
kernel_md5 + "\n";
device_md5 = device_md5_hash("");
clbin = string_printf("cycles_kernel_%s_%s_Subsurface.clbin",
device_md5.c_str(), kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&subsurface_program,
kernel_path, kernel_md5, device_md5, kernel_init_source, clbin, "
-D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&subsurface_program,
kernel_path, kernel_md5, device_md5, kernel_init_source, clbin,
"-D__SPLIT_KERNEL__ "))
return false;
#endif
kernel_init_source = "#include \"kernel_DirectLighting.cl\" //
" + kernel_md5 + "\n";
device_md5 = device_md5_hash(svm_build_options);
clbin =
string_printf("cycles_kernel_%s_%s_DirectLighting.clbin", device_md5.c_str(),
kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&directLighting_program,
kernel_path, "directLighting", device_md5, kernel_init_source, clbin,
svm_build_options + " -D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&directLighting_program,
kernel_path, "directLighting", device_md5, kernel_init_source, clbin,
svm_build_options + "-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include \"kernel_ShadowBlocked.cl\" // "
+ kernel_md5 + "\n";
device_md5 = device_md5_hash(svm_build_options);
clbin =
string_printf("cycles_kernel_%s_%s_ShadowBlocked.clbin", device_md5.c_str(),
kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&shadowBlocked_program,
kernel_path, "shadow", device_md5, kernel_init_source, clbin, svm_build_options
+ " -D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&shadowBlocked_program,
kernel_path, "shadow", device_md5, kernel_init_source, clbin, svm_build_options
+ "-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include \"kernel_NextIterationSetUp.cl\"
// " + kernel_md5 + "\n";
device_md5 = device_md5_hash("");
clbin =
string_printf("cycles_kernel_%s_%s_NextIterationSetUp.clbin",
device_md5.c_str(), kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&nextIterationSetUp_program,
kernel_path, "nextIter", device_md5, kernel_init_source, clbin, "
-D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&nextIterationSetUp_program,
kernel_path, "nextIter", device_md5, kernel_init_source, clbin,
"-D__SPLIT_KERNEL__ "))
return false;
kernel_init_source = "#include \"kernel_SumAllRadiance.cl\" //
" + kernel_md5 + "\n";
device_md5 = device_md5_hash("");
clbin =
string_printf("cycles_kernel_%s_%s_SumAllRadiance.clbin", device_md5.c_str(),
kernel_md5.c_str());
- if(!load_split_kernel_SPLIT_KERNEL(&sumAllRadiance_program,
kernel_path, "sumAll", device_md5, kernel_init_source, clbin, "
-D__SPLIT_KERNEL__ "))
+ if(!load_split_kernel_SPLIT_KERNEL(&sumAllRadiance_program,
kernel_path, "sumAll", device_md5, kernel_init_source, clbin,
"-D__SPLIT_KERNEL__ "))
return false;
current_clos_max = clos_max;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
