[Bf-blender-cvs] [b698fe1e047] master: Cleanup: compiler warnings

[Brecht Van Lommel]

Commit: b698fe1e047e56e8ed67ba47464c0017d9c50eea
Author: Brecht Van Lommel
Date:   Tue Oct 26 15:30:12 2021 +0200
Branches: master
https://developer.blender.org/rBb698fe1e047e56e8ed67ba47464c0017d9c50eea

Cleanup: compiler warnings

===================================================================

M	intern/cycles/integrator/path_trace_work_gpu.cpp
M	intern/cycles/render/integrator.cpp
M	intern/cycles/render/integrator.h
M	intern/cycles/render/scene.cpp

===================================================================

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;