[Bf-blender-cvs] [60656587cca] cycles-x: Cleanup: remove outdated decoupled volume device feature

[Brecht Van Lommel]

Commit: 60656587cca7b622db70dfa761911b5420862b33
Author: Brecht Van Lommel
Date:   Thu Jul 8 15:49:44 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB60656587cca7b622db70dfa761911b5420862b33

Cleanup: remove outdated decoupled volume device feature

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

M	intern/cycles/device/cpu/device.cpp
M	intern/cycles/device/cuda/device.cpp
M	intern/cycles/device/device.cpp
M	intern/cycles/device/device.h
M	intern/cycles/device/opencl/device.cpp
M	intern/cycles/kernel/kernel_types.h
M	intern/cycles/render/shader.cpp

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

diff --git a/intern/cycles/device/cpu/device.cpp b/intern/cycles/device/cpu/device.cpp
index 5f4e25e5dc7..68ca8e8bb22 100644
--- a/intern/cycles/device/cpu/device.cpp
+++ b/intern/cycles/device/cpu/device.cpp
@@ -37,7 +37,6 @@ void device_cpu_info(vector<DeviceInfo> &devices)
   info.description = system_cpu_brand_string();
   info.id = "CPU";
   info.num = 0;
-  info.has_volume_decoupled = true;
   info.has_osl = true;
   info.has_half_images = true;
   info.has_nanovdb = true;
diff --git a/intern/cycles/device/cuda/device.cpp b/intern/cycles/device/cuda/device.cpp
index fc140a1b38f..95b8022aa23 100644
--- a/intern/cycles/device/cuda/device.cpp
+++ b/intern/cycles/device/cuda/device.cpp
@@ -146,7 +146,6 @@ void device_cuda_info(vector<DeviceInfo> &devices)
 
     info.has_half_images = (major >= 3);
     info.has_nanovdb = true;
-    info.has_volume_decoupled = false;
     info.denoisers = 0;
 
     /* Check if the device has P2P access to any other device in the system. */
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index a5eb56f1e00..6a44ee9ffff 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -317,7 +317,6 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo> &subdevices,
 
   info.has_half_images = true;
   info.has_nanovdb = true;
-  info.has_volume_decoupled = true;
   info.has_osl = true;
   info.has_profiling = true;
   info.has_peer_memory = false;
@@ -365,7 +364,6 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo> &subdevices,
     /* Accumulate device info. */
     info.has_half_images &= device.has_half_images;
     info.has_nanovdb &= device.has_nanovdb;
-    info.has_volume_decoupled &= device.has_volume_decoupled;
     info.has_osl &= device.has_osl;
     info.has_profiling &= device.has_profiling;
     info.has_peer_memory |= device.has_peer_memory;
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index de3920f1cf3..efe2f2213f5 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -74,7 +74,6 @@ class DeviceInfo {
   bool display_device;        /* GPU is used as a display device. */
   bool has_nanovdb;           /* Support NanoVDB volumes. */
   bool has_half_images;       /* Support half-float textures. */
-  bool has_volume_decoupled;  /* Decoupled volume shading. */
   bool has_osl;               /* Support Open Shading Language. */
   bool has_profiling;         /* Supports runtime collection of profiling info. */
   bool has_peer_memory;       /* GPU has P2P access to memory of another GPU. */
@@ -92,7 +91,6 @@ class DeviceInfo {
     display_device = false;
     has_half_images = false;
     has_nanovdb = false;
-    has_volume_decoupled = false;
     has_osl = false;
     has_profiling = false;
     has_peer_memory = false;
diff --git a/intern/cycles/device/opencl/device.cpp b/intern/cycles/device/opencl/device.cpp
index bfbdf11e4a4..299066d86b9 100644
--- a/intern/cycles/device/opencl/device.cpp
+++ b/intern/cycles/device/opencl/device.cpp
@@ -136,7 +136,6 @@ void device_opencl_info(vector<DeviceInfo> &devices)
     /* We don't know if it's used for display, but assume it is. */
     info.display_device = true;
     info.use_split_kernel = true;
-    info.has_volume_decoupled = false;
     info.denoisers = 0;
     info.id = id;
 
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index a9ca02e3e59..18d1c883229 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -122,7 +122,6 @@ CCL_NAMESPACE_BEGIN
 #  ifdef WITH_OSL
 #    define __OSL__
 #  endif
-#  define __VOLUME_DECOUPLED__
 #  define __VOLUME_RECORD_ALL__
 #endif /* __KERNEL_CPU__ */
 
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 0e9d4a13199..a8f91514ae9 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -531,12 +531,10 @@ void ShaderManager::device_update_common(Device *device,
       flag |= SD_NEED_VOLUME_ATTRIBUTES;
     if (shader->has_bssrdf_bump)
       flag |= SD_HAS_BSSRDF_BUMP;
-    if (device->info.has_volume_decoupled) {
-      if (shader->get_volume_sampling_method() == VOLUME_SAMPLING_EQUIANGULAR)
-        flag |= SD_VOLUME_EQUIANGULAR;
-      if (shader->get_volume_sampling_method() == VOLUME_SAMPLING_MULTIPLE_IMPORTANCE)
-        flag |= SD_VOLUME_MIS;
-    }
+    if (shader->get_volume_sampling_method() == VOLUME_SAMPLING_EQUIANGULAR)
+      flag |= SD_VOLUME_EQUIANGULAR;
+    if (shader->get_volume_sampling_method() == VOLUME_SAMPLING_MULTIPLE_IMPORTANCE)
+      flag |= SD_VOLUME_MIS;
     if (shader->get_volume_interpolation_method() == VOLUME_INTERPOLATION_CUBIC)
       flag |= SD_VOLUME_CUBIC;
     if (shader->has_bump)