bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cycles: Move requested feature conversion to an own function

Browse Source 
This way it could be used for the shader/baking kernels easily n the future.
making those kernels more optimal.
This commit is contained in:
Sergey Sharybin 2015-06-06 15:33:37 +02:00
parent 8c2750bc82
commit 2ebaa69676
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
intern/cycles/device/device_opencl.cpp
View File

@ -1262,6 +1262,31 @@ protected:
clReleaseProgram(program);
}
}
string build_options_from_requested_features(
const DeviceRequestedFeatures& requested_features)
{
string build_options = "";
if(requested_features.experimental) {
build_options += " -D__KERNEL_EXPERIMENTAL__";
}
build_options += " -D__NODES_MAX_GROUP__=" +
string_printf("%d", requested_features.max_nodes_group);
build_options += " -D__NODES_FEATURES__=" +
string_printf("%d", requested_features.nodes_features);
build_options += string_printf(" -D__MAX_CLOSURE__=%d",
requested_features.max_closure);
if(!requested_features.use_hair) {
build_options += " -D__NO_HAIR__";
}
if(!requested_features.use_object_motion) {
build_options += " -D__NO_OBJECT_MOTION__";
}
if(!requested_features.use_camera_motion) {
build_options += " -D__NO_CAMERA_MOTION__";
}
return build_options;
}
};
class OpenCLDeviceMegaKernel : public OpenCLDeviceBase
@ -1951,37 +1976,15 @@ public:
string kernel_path = path_get("kernel");
string kernel_md5 = path_files_md5_hash(kernel_path);
string device_md5;
string build_options;
string kernel_init_source;
string clbin;
string clsrc, *debug_src = NULL;
build_options += "-D__SPLIT_KERNEL__";
string build_options = "-D__SPLIT_KERNEL__";
#ifdef __WORK_STEALING__
build_options += " -D__WORK_STEALING__";
#endif
/* TODO(sergey): Make it a separate function to convert requested
* features to build flags in order to make code a bit cleaner.
*/
if(requested_features.experimental) {
build_options += " -D__KERNEL_EXPERIMENTAL__";
}
build_options += " -D__NODES_MAX_GROUP__=" +
string_printf("%d", requested_features.max_nodes_group);
build_options += " -D__NODES_FEATURES__=" +
string_printf("%d", requested_features.nodes_features);
build_options += string_printf(" -D__MAX_CLOSURE__=%d",
requested_features.max_closure);
if(!requested_features.use_hair) {
build_options += " -D__NO_HAIR__";
}
if(!requested_features.use_object_motion) {
build_options += " -D__NO_OBJECT_MOTION__";
}
if(!requested_features.use_camera_motion) {
build_options += " -D__NO_CAMERA_MOTION__";
}
build_options += build_options_from_requested_features(requested_features);
/* Set compute device build option. */
cl_device_type device_type;