[Bf-blender-cvs] [57e82df5d2f] cycles-x: Cleanup: compiler warnings

Brecht Van Lommel noreply at git.blender.org
Tue May 4 14:08:09 CEST 2021


Commit: 57e82df5d2f8b28d2973574b3bbf47dab7148bee
Author: Brecht Van Lommel
Date:   Fri Apr 30 17:41:20 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB57e82df5d2f8b28d2973574b3bbf47dab7148bee

Cleanup: compiler warnings

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

M	intern/cycles/kernel/kernel_differential.h
M	intern/cycles/kernel/svm/svm_types.h

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

diff --git a/intern/cycles/kernel/kernel_differential.h b/intern/cycles/kernel/kernel_differential.h
index 5d08892fab8..db4e110bd10 100644
--- a/intern/cycles/kernel/kernel_differential.h
+++ b/intern/cycles/kernel/kernel_differential.h
@@ -134,10 +134,10 @@ ccl_device_forceinline float differential_make_compact(const differential3 D)
 
 ccl_device_forceinline void differential_transfer_compact(ccl_addr_space differential3 *surface_dP,
                                                           const float ray_dP,
-                                                          float3 ray_D,
+                                                          const float3 /* ray_D */,
                                                           const float ray_dD,
-                                                          float3 surface_Ng,
-                                                          float ray_t)
+                                                          const float3 surface_Ng,
+                                                          const float ray_t)
 {
   /* ray differential transfer through homogeneous medium, to
    * compute dPdx/dy at a shading point from the incoming ray */
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 280342594d2..c246220e27c 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -46,13 +46,13 @@ CCL_NAMESPACE_BEGIN
 #define NODE_GROUP_LEVEL_MAX NODE_GROUP_LEVEL_4
 
 enum SvmNodeFeatureFlag {
-  NODE_FEATURE_BSDF = (1 << 0),
-  NODE_FEATURE_EMISSION = (1 << 1),
-  NODE_FEATURE_VOLUME = (1 << 2),
-  NODE_FEATURE_HAIR = (1 << 3),
-  NODE_FEATURE_BUMP = (1 << 4),
-  NODE_FEATURE_BUMP_STATE = (1 << 5),
-  NODE_FEATURE_VORONOI_EXTRA = (1 << 6),
+  NODE_FEATURE_BSDF = (1U << 0U),
+  NODE_FEATURE_EMISSION = (1U << 1U),
+  NODE_FEATURE_VOLUME = (1U << 2U),
+  NODE_FEATURE_HAIR = (1U << 3U),
+  NODE_FEATURE_BUMP = (1U << 4U),
+  NODE_FEATURE_BUMP_STATE = (1U << 5U),
+  NODE_FEATURE_VORONOI_EXTRA = (1U << 6U),
   NODE_FEATURE_ALL = (unsigned int)(~0),
 };



More information about the Bf-blender-cvs mailing list