blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Cycles/OpenCL: Added missing opencl programs 

The functions that determine the program name + filename of kernels
were missing some base kernels like denoising and base. For completeness
I added those kernels so the function returns the correct results.
This commit is contained in:
Jeroen Bakker 2019-03-15 08:11:28 +01:00
parent 57b5852bc8
commit 6237743111
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/device/opencl/opencl_split.cpp
View File

@ -40,7 +40,13 @@ struct texture_slot_t {
int slot;
};
static const string fast_compiled_kernels =
static const string NON_SPLIT_KERNELS =
"denoising "
"base "
"background "
"displace ";
static const string SPLIT_BUNDLE_KERNELS =
"data_init "
"path_init "
"state_buffer_size "
@ -55,7 +61,10 @@ static const string fast_compiled_kernels =
const string OpenCLDevice::get_opencl_program_name(const string& kernel_name)
{
if (fast_compiled_kernels.find(kernel_name) != std::string::npos) {
if (NON_SPLIT_KERNELS.find(kernel_name) != std::string::npos) {
return kernel_name;
}
else if (SPLIT_BUNDLE_KERNELS.find(kernel_name) != std::string::npos) {
return "split_bundle";
}
else {
@ -65,7 +74,10 @@ const string OpenCLDevice::get_opencl_program_name(const string& kernel_name)
const string OpenCLDevice::get_opencl_program_filename(const string& kernel_name)
{
if (fast_compiled_kernels.find(kernel_name) != std::string::npos) {
if (kernel_name == "denoising") {
return "filter.cl";
}
else if (SPLIT_BUNDLE_KERNELS.find(kernel_name) != std::string::npos) {
return "kernel_split_bundle.cl";
}
else {