[Bf-blender-cvs] [eccc9d8eba8] master: Cleanup: Remove unused function in Cycles queue

Sergey Sharybin noreply at git.blender.org
Tue Apr 19 11:02:51 CEST 2022


Commit: eccc9d8eba8d65009307ebc7d4da344e9416d89b
Author: Sergey Sharybin
Date:   Thu Apr 14 16:42:12 2022 +0200
Branches: master
https://developer.blender.org/rBeccc9d8eba8d65009307ebc7d4da344e9416d89b

Cleanup: Remove unused function in Cycles queue

Noticed while looking into oneAPI patch.

Seems to be unused, without clear indication why/when it might be
needed. Removing the function simplifies adding the new backend.

Differential Revision: https://developer.blender.org/D14652

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

M	intern/cycles/device/cuda/queue.cpp
M	intern/cycles/device/cuda/queue.h
M	intern/cycles/device/hip/queue.cpp
M	intern/cycles/device/hip/queue.h
M	intern/cycles/device/metal/queue.h
M	intern/cycles/device/metal/queue.mm
M	intern/cycles/device/queue.h

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

diff --git a/intern/cycles/device/cuda/queue.cpp b/intern/cycles/device/cuda/queue.cpp
index a2ca70611bf..38c71866ad0 100644
--- a/intern/cycles/device/cuda/queue.cpp
+++ b/intern/cycles/device/cuda/queue.cpp
@@ -71,11 +71,6 @@ void CUDADeviceQueue::init_execution()
   debug_init_execution();
 }
 
-bool CUDADeviceQueue::kernel_available(DeviceKernel kernel) const
-{
-  return cuda_device_->kernels.available(kernel);
-}
-
 bool CUDADeviceQueue::enqueue(DeviceKernel kernel,
                               const int work_size,
                               DeviceKernelArguments const &args)
diff --git a/intern/cycles/device/cuda/queue.h b/intern/cycles/device/cuda/queue.h
index 4612e517de7..b450f5b3592 100644
--- a/intern/cycles/device/cuda/queue.h
+++ b/intern/cycles/device/cuda/queue.h
@@ -27,8 +27,6 @@ class CUDADeviceQueue : public DeviceQueue {
 
   virtual void init_execution() override;
 
-  virtual bool kernel_available(DeviceKernel kernel) const override;
-
   virtual bool enqueue(DeviceKernel kernel,
                        const int work_size,
                        DeviceKernelArguments const &args) override;
diff --git a/intern/cycles/device/hip/queue.cpp b/intern/cycles/device/hip/queue.cpp
index 42778bc31cf..6c2c2c29624 100644
--- a/intern/cycles/device/hip/queue.cpp
+++ b/intern/cycles/device/hip/queue.cpp
@@ -71,11 +71,6 @@ void HIPDeviceQueue::init_execution()
   debug_init_execution();
 }
 
-bool HIPDeviceQueue::kernel_available(DeviceKernel kernel) const
-{
-  return hip_device_->kernels.available(kernel);
-}
-
 bool HIPDeviceQueue::enqueue(DeviceKernel kernel,
                              const int work_size,
                              DeviceKernelArguments const &args)
diff --git a/intern/cycles/device/hip/queue.h b/intern/cycles/device/hip/queue.h
index 11f60d04ad4..729d8a19acb 100644
--- a/intern/cycles/device/hip/queue.h
+++ b/intern/cycles/device/hip/queue.h
@@ -27,8 +27,6 @@ class HIPDeviceQueue : public DeviceQueue {
 
   virtual void init_execution() override;
 
-  virtual bool kernel_available(DeviceKernel kernel) const override;
-
   virtual bool enqueue(DeviceKernel kernel,
                        const int work_size,
                        DeviceKernelArguments const &args) override;
diff --git a/intern/cycles/device/metal/queue.h b/intern/cycles/device/metal/queue.h
index 1e1c6d5fcc1..6cc84a20787 100644
--- a/intern/cycles/device/metal/queue.h
+++ b/intern/cycles/device/metal/queue.h
@@ -39,8 +39,6 @@ class MetalDeviceQueue : public DeviceQueue {
   virtual void copy_to_device(device_memory &mem) override;
   virtual void copy_from_device(device_memory &mem) override;
 
-  virtual bool kernel_available(DeviceKernel kernel) const override;
-
  protected:
   void prepare_resources(DeviceKernel kernel);
 
diff --git a/intern/cycles/device/metal/queue.mm b/intern/cycles/device/metal/queue.mm
index c0f53386dff..1686ab95ffa 100644
--- a/intern/cycles/device/metal/queue.mm
+++ b/intern/cycles/device/metal/queue.mm
@@ -492,11 +492,6 @@ void MetalDeviceQueue::copy_from_device(device_memory &mem)
   }
 }
 
-bool MetalDeviceQueue::kernel_available(DeviceKernel kernel) const
-{
-  return metal_device->kernels.available(kernel);
-}
-
 void MetalDeviceQueue::prepare_resources(DeviceKernel kernel)
 {
   std::lock_guard<std::recursive_mutex> lock(metal_device->metal_mem_map_mutex);
diff --git a/intern/cycles/device/queue.h b/intern/cycles/device/queue.h
index 2bd6e7ae460..14a5db3a204 100644
--- a/intern/cycles/device/queue.h
+++ b/intern/cycles/device/queue.h
@@ -112,9 +112,6 @@ class DeviceQueue {
    * Use this method after device synchronization has finished before enqueueing any kernels. */
   virtual void init_execution() = 0;
 
-  /* Test if an optional device kernel is available. */
-  virtual bool kernel_available(DeviceKernel kernel) const = 0;
-
   /* Enqueue kernel execution.
    *
    * Execute the kernel work_size times on the device.



More information about the Bf-blender-cvs mailing list