diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 18:08:01 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 18:25:44 +0300 |
commit | b4e1571d0bcf186df979455cf9852dccd325345b (patch) | |
tree | d13b72ce1050fc0035b9d682a10531bc4a174fbf /intern/cycles/device | |
parent | c78b831e69faaa206ca457e80581f6371cad73fa (diff) |
Cleanup: compiler warnings
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device_denoising.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/device_optix.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/device/device_task.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/intern/cycles/device/device_denoising.cpp b/intern/cycles/device/device_denoising.cpp index 91ebb7c266e..89de80a5bcd 100644 --- a/intern/cycles/device/device_denoising.cpp +++ b/intern/cycles/device/device_denoising.cpp @@ -57,7 +57,7 @@ DenoisingTask::DenoisingTask(Device *device, const DeviceTask &task) } do_prefilter = task.denoising.store_passes && task.denoising.type == DENOISER_NLM; - do_filter = task.denoising_do_filter && task.denoising.type == DENOISER_NLM; + do_filter = task.denoising.use && task.denoising.type == DENOISER_NLM; } DenoisingTask::~DenoisingTask() diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index d4d859e8593..ececca3df53 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -1445,21 +1445,21 @@ class OptiXDevice : public CUDADevice { KernelData *const data = (KernelData *)host; *(OptixTraversableHandle *)&data->bvh.scene = tlas_handle; - update_launch_params(name, offsetof(KernelParams, data), host, size); + update_launch_params(offsetof(KernelParams, data), host, size); return; } // Update data storage pointers in launch parameters # define KERNEL_TEX(data_type, tex_name) \ if (strcmp(name, #tex_name) == 0) { \ - update_launch_params(name, offsetof(KernelParams, tex_name), host, size); \ + update_launch_params(offsetof(KernelParams, tex_name), host, size); \ return; \ } # include "kernel/kernel_textures.h" # undef KERNEL_TEX } - void update_launch_params(const char *name, size_t offset, void *data, size_t data_size) + void update_launch_params(size_t offset, void *data, size_t data_size) { const CUDAContextScope scope(cuContext); diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index aeb5ff72e89..600973b8100 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -158,9 +158,6 @@ class DeviceTask { bool denoising_from_render; vector<int> denoising_frames; - bool denoising_do_filter; - bool denoising_do_prefilter; - int pass_stride; int frame_stride; int target_pass_stride; |