[Bf-blender-cvs] [385c40b114b] cycles-x: Cycles: Rename __SHADOW_TRICKS__ to __SHADOW_CATCHER__

[Sergey Sharybin]

Commit: 385c40b114b2038677b81ce96d9ad3c87956cf8f
Author: Sergey Sharybin
Date:   Tue May 4 14:36:41 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB385c40b114b2038677b81ce96d9ad3c87956cf8f

Cycles: Rename __SHADOW_TRICKS__ to __SHADOW_CATCHER__

Makes it more explicit what the code and feature is about.

The shadow tricks are not used anymore (they were used by the NLM
denoiser). Some of the code is still referring to the __SHADOW_TRICKS__
but it is all in an unused code paths.

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

M	intern/cycles/device/device.h
M	intern/cycles/device/opencl/device_impl.cpp
M	intern/cycles/kernel/kernel_types.h
M	intern/cycles/render/scene.cpp

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

diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 845f5bff586..7b616cb64e1 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -148,8 +148,8 @@ class DeviceRequestedFeatures {
   /* Use Transparent shadows */
   bool use_transparent;
 
-  /* Use various shadow tricks, such as shadow catcher. */
-  bool use_shadow_tricks;
+  /* Use shadow catcher. */
+  bool use_shadow_catcher;
 
   /* Per-uber shader usage flags. */
   bool use_principled;
@@ -183,7 +183,7 @@ class DeviceRequestedFeatures {
     use_volume = false;
     use_patch_evaluation = false;
     use_transparent = false;
-    use_shadow_tricks = false;
+    use_shadow_catcher = false;
     use_principled = false;
     use_denoising = false;
     use_shader_raytrace = false;
@@ -205,7 +205,7 @@ class DeviceRequestedFeatures {
              use_volume == requested_features.use_volume &&
              use_patch_evaluation == requested_features.use_patch_evaluation &&
              use_transparent == requested_features.use_transparent &&
-             use_shadow_tricks == requested_features.use_shadow_tricks &&
+             use_shadow_catcher == requested_features.use_shadow_catcher &&
              use_principled == requested_features.use_principled &&
              use_denoising == requested_features.use_denoising &&
              use_shader_raytrace == requested_features.use_shader_raytrace &&
@@ -248,8 +248,8 @@ class DeviceRequestedFeatures {
     if (!use_transparent && !use_volume) {
       build_options += " -D__NO_TRANSPARENT__";
     }
-    if (!use_shadow_tricks) {
-      build_options += " -D__NO_SHADOW_TRICKS__";
+    if (!use_shadow_catcher) {
+      build_options += " -D__NO_SHADOW_CATCHER__";
     }
     if (!use_principled) {
       build_options += " -D__NO_PRINCIPLED__";
diff --git a/intern/cycles/device/opencl/device_impl.cpp b/intern/cycles/device/opencl/device_impl.cpp
index 851bfe371c6..b9f9c51a5f1 100644
--- a/intern/cycles/device/opencl/device_impl.cpp
+++ b/intern/cycles/device/opencl/device_impl.cpp
@@ -88,7 +88,7 @@ const string OpenCLDevice::get_opencl_program_filename(const string &kernel_name
 void OpenCLDevice::enable_default_features(DeviceRequestedFeatures &features)
 {
   features.use_transparent = true;
-  features.use_shadow_tricks = true;
+  features.use_shadow_catcher = true;
   features.use_principled = true;
   features.use_denoising = true;
 
@@ -136,7 +136,7 @@ string OpenCLDevice::get_build_options(const DeviceRequestedFeatures &requested_
     features.use_camera_motion = false;
     features.use_baking = false;
     features.use_transparent = false;
-    features.use_shadow_tricks = false;
+    features.use_shadow_catcher = false;
     features.use_subsurface = false;
     features.use_volume = false;
     features.nodes_features &= ~NODE_FEATURE_VOLUME;
@@ -154,7 +154,7 @@ string OpenCLDevice::get_build_options(const DeviceRequestedFeatures &requested_
     features.use_object_motion = false;
     features.use_camera_motion = false;
     features.use_transparent = false;
-    features.use_shadow_tricks = false;
+    features.use_shadow_catcher = false;
     features.use_denoising = false;
     /* NOTE: currently possible to use surface nodes like `Hair Info`, `Bump` node.
      * Perhaps we should remove them in UI as it does not make any sense when
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index a5376a08b61..09b14cea2dc 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -93,7 +93,7 @@ CCL_NAMESPACE_BEGIN
 #define __INTERSECTION_REFINE__
 #define __CLAMP_SAMPLE__
 #define __PATCH_EVAL__
-#define __SHADOW_TRICKS__
+#define __SHADOW_CATCHER__
 #define __DENOISING_FEATURES__
 #define __SHADER_RAYTRACE__
 #define __AO__
@@ -161,8 +161,8 @@ CCL_NAMESPACE_BEGIN
 #ifdef __NO_TRANSPARENT__
 #  undef __TRANSPARENT_SHADOWS__
 #endif
-#ifdef __NO_SHADOW_TRICKS__
-#  undef __SHADOW_TRICKS__
+#ifdef __NO_SHADOW_CATCHER__
+#  undef __SHADOW_CATCHER__
 #endif
 #ifdef __NO_PRINCIPLED__
 #  undef __PRINCIPLED__
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index d6c394df9a3..3a8b336479e 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -471,7 +471,7 @@ DeviceRequestedFeatures Scene::get_requested_device_features()
       requested_features.use_camera_motion |= geom->get_use_motion_blur();
     }
     if (object->get_is_shadow_catcher()) {
-      requested_features.use_shadow_tricks = true;
+      requested_features.use_shadow_catcher = true;
     }
     if (geom->is_mesh()) {
       Mesh *mesh = static_cast<Mesh *>(geom);
@@ -493,7 +493,6 @@ DeviceRequestedFeatures Scene::get_requested_device_features()
 
   if (Pass::contains(passes, PASS_DENOISING_COLOR)) {
     requested_features.use_denoising = true;
-    requested_features.use_shadow_tricks = true;
   }
 
   return requested_features;