diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-26 16:30:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-26 16:35:31 +0300 |
| commit | b698fe1e047e56e8ed67ba47464c0017d9c50eea (patch) | |
| tree | ced6e1660345c4e1bbe6c65fdf03418448481cbf /intern | |
| parent | fd477e738dfd65f7bb0f06c1d91c3259ed26295d (diff) | |
Cleanup: compiler warnings
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/integrator/path_trace_work_gpu.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/render/integrator.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/integrator.h | 2 | ||||
| -rw-r--r-- | intern/cycles/render/scene.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/integrator/path_trace_work_gpu.cpp b/intern/cycles/integrator/path_trace_work_gpu.cpp index 605c1efca0f..775cee57a90 100644 --- a/intern/cycles/integrator/path_trace_work_gpu.cpp +++ b/intern/cycles/integrator/path_trace_work_gpu.cpp @@ -120,7 +120,7 @@ void PathTraceWorkGPU::alloc_integrator_soa() * TODO: store float3 in separate XYZ arrays. */ #define KERNEL_STRUCT_BEGIN(name) for (int array_index = 0;; array_index++) { #define KERNEL_STRUCT_MEMBER(parent_struct, type, name, feature) \ - if ((kernel_features & feature) && (integrator_state_gpu_.parent_struct.name == nullptr)) { \ + if ((kernel_features & (feature)) && (integrator_state_gpu_.parent_struct.name == nullptr)) { \ device_only_memory<type> *array = new device_only_memory<type>(device_, \ "integrator_state_" #name); \ array->alloc_to_device(max_num_paths_); \ @@ -128,7 +128,7 @@ void PathTraceWorkGPU::alloc_integrator_soa() integrator_state_gpu_.parent_struct.name = (type *)array->device_pointer; \ } #define KERNEL_STRUCT_ARRAY_MEMBER(parent_struct, type, name, feature) \ - if ((kernel_features & feature) && \ + if ((kernel_features & (feature)) && \ (integrator_state_gpu_.parent_struct[array_index].name == nullptr)) { \ device_only_memory<type> *array = new device_only_memory<type>(device_, \ "integrator_state_" #name); \ diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index 16d9fc60fd3..06fa7339b51 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -270,7 +270,7 @@ void Integrator::tag_update(Scene *scene, uint32_t flag) } } -uint Integrator::get_kernel_features(const Scene *scene) const +uint Integrator::get_kernel_features() const { uint kernel_features = 0; diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h index 91efc25e51e..468971986c5 100644 --- a/intern/cycles/render/integrator.h +++ b/intern/cycles/render/integrator.h @@ -102,7 +102,7 @@ class Integrator : public Node { void tag_update(Scene *scene, uint32_t flag); - uint get_kernel_features(const Scene *scene) const; + uint get_kernel_features() const; AdaptiveSampling get_adaptive_sampling() const; DenoiseParams get_denoise_params() const; diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 669f5abf7d6..20081677251 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -522,7 +522,7 @@ void Scene::update_kernel_features() } kernel_features |= film->get_kernel_features(this); - kernel_features |= integrator->get_kernel_features(this); + kernel_features |= integrator->get_kernel_features(); dscene.data.kernel_features = kernel_features; |