diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 07:03:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 07:08:16 +0300 |
| commit | 5ef4b0438cf4773e7dd8c661388bb2c3079869bf (patch) | |
| tree | 634b95c85cdc786d48904b3ee3bb47f77eaff262 /intern/cycles/device | |
| parent | 7e6263095de1ded7b17ed9c4d030d1b9dac6d9ed (diff) | |
Cleanup: trailing space
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/opencl/opencl.h | 4 | ||||
| -rw-r--r-- | intern/cycles/device/opencl/opencl_split.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h index a8ad4a935f7..89761293638 100644 --- a/intern/cycles/device/opencl/opencl.h +++ b/intern/cycles/device/opencl/opencl.h @@ -296,9 +296,9 @@ public: const string& get_log() const { return log; } void report_error(); - /* Wait until this kernel is available to be used + /* Wait until this kernel is available to be used * It will return true when the kernel is available. - * It will return false when the kernel is not available + * It will return false when the kernel is not available * or could not be loaded. */ bool wait_for_availability(); diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index fd7eebf0221..489d10b7087 100644 --- a/intern/cycles/device/opencl/opencl_split.cpp +++ b/intern/cycles/device/opencl/opencl_split.cpp @@ -396,8 +396,8 @@ public: OpenCLDevice::OpenCLProgram(device, program_name, device->get_opencl_program_filename(kernel_name), - device->get_build_options(requested_features, - program_name, + device->get_build_options(requested_features, + program_name, device->use_preview_kernels)); kernel->program.add_kernel(ustring("path_trace_" + kernel_name)); @@ -770,7 +770,7 @@ bool OpenCLDevice::load_kernels(const DeviceRequestedFeatures& requested_feature /* Verify we have right opencl version. */ if(!opencl_version_check()) return false; - + load_required_kernels(requested_features); vector<OpenCLProgram*> programs; @@ -880,7 +880,7 @@ DeviceKernelStatus OpenCLDevice::get_active_kernel_switch_state() { /* Do not switch kernels for background renderings * We do foreground rendering but use the preview kernels - * Check for the optimized kernels + * Check for the optimized kernels * * This works also the other way around, where we are using * optimized kernels but new ones are being compiled due @@ -891,7 +891,7 @@ DeviceKernelStatus OpenCLDevice::get_active_kernel_switch_state() * this as an early exit */ return DEVICE_KERNEL_USING_FEATURE_KERNEL; } - + bool other_kernels_finished = load_kernel_task_pool.finished(); if (use_preview_kernels) { if (other_kernels_finished) { |