diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/device/cpu/device_impl.cpp | 5 | ||||
-rw-r--r-- | intern/cycles/device/cpu/device_impl.h | 2 | ||||
-rw-r--r-- | intern/cycles/device/cuda/device_impl.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/device/cuda/device_impl.h | 2 | ||||
-rw-r--r-- | intern/cycles/device/device.h | 4 | ||||
-rw-r--r-- | intern/cycles/device/hip/device_impl.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/device/hip/device_impl.h | 2 | ||||
-rw-r--r-- | intern/cycles/device/multi/device.cpp | 8 |
8 files changed, 0 insertions, 35 deletions
diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp index 68dec7f0af2..2ad76de70ca 100644 --- a/intern/cycles/device/cpu/device_impl.cpp +++ b/intern/cycles/device/cpu/device_impl.cpp @@ -93,11 +93,6 @@ CPUDevice::~CPUDevice() texture_info.free(); } -bool CPUDevice::show_samples() const -{ - return (info.cpu_threads == 1); -} - BVHLayoutMask CPUDevice::get_bvh_layout_mask() const { BVHLayoutMask bvh_layout_mask = BVH_LAYOUT_BVH2; diff --git a/intern/cycles/device/cpu/device_impl.h b/intern/cycles/device/cpu/device_impl.h index 90d217bb624..6f9452a6378 100644 --- a/intern/cycles/device/cpu/device_impl.h +++ b/intern/cycles/device/cpu/device_impl.h @@ -60,8 +60,6 @@ class CPUDevice : public Device { CPUDevice(const DeviceInfo &info_, Stats &stats_, Profiler &profiler_); ~CPUDevice(); - virtual bool show_samples() const override; - virtual BVHLayoutMask get_bvh_layout_mask() const override; /* Returns true if the texture info was copied to the device (meaning, some more diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp index 95629c57908..5ab73a6b9ef 100644 --- a/intern/cycles/device/cuda/device_impl.cpp +++ b/intern/cycles/device/cuda/device_impl.cpp @@ -46,12 +46,6 @@ bool CUDADevice::have_precompiled_kernels() return path_exists(cubins_path); } -bool CUDADevice::show_samples() const -{ - /* The CUDADevice only processes one tile at a time, so showing samples is fine. */ - return true; -} - BVHLayoutMask CUDADevice::get_bvh_layout_mask() const { return BVH_LAYOUT_BVH2; diff --git a/intern/cycles/device/cuda/device_impl.h b/intern/cycles/device/cuda/device_impl.h index 72d4108d1bf..4c357d0b5ab 100644 --- a/intern/cycles/device/cuda/device_impl.h +++ b/intern/cycles/device/cuda/device_impl.h @@ -76,8 +76,6 @@ class CUDADevice : public Device { static bool have_precompiled_kernels(); - virtual bool show_samples() const override; - virtual BVHLayoutMask get_bvh_layout_mask() const override; void set_error(const string &error) override; diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index a7d47f23d54..346632de314 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -149,10 +149,6 @@ class Device { fprintf(stderr, "%s\n", error.c_str()); fflush(stderr); } - virtual bool show_samples() const - { - return false; - } virtual BVHLayoutMask get_bvh_layout_mask() const = 0; /* statistics */ diff --git a/intern/cycles/device/hip/device_impl.cpp b/intern/cycles/device/hip/device_impl.cpp index 71f3b7ce4fe..950fcaf1816 100644 --- a/intern/cycles/device/hip/device_impl.cpp +++ b/intern/cycles/device/hip/device_impl.cpp @@ -47,12 +47,6 @@ bool HIPDevice::have_precompiled_kernels() return path_exists(fatbins_path); } -bool HIPDevice::show_samples() const -{ - /* The HIPDevice only processes one tile at a time, so showing samples is fine. */ - return true; -} - BVHLayoutMask HIPDevice::get_bvh_layout_mask() const { return BVH_LAYOUT_BVH2; diff --git a/intern/cycles/device/hip/device_impl.h b/intern/cycles/device/hip/device_impl.h index 48d7bdef032..08a7be57e9c 100644 --- a/intern/cycles/device/hip/device_impl.h +++ b/intern/cycles/device/hip/device_impl.h @@ -75,8 +75,6 @@ class HIPDevice : public Device { static bool have_precompiled_kernels(); - virtual bool show_samples() const override; - virtual BVHLayoutMask get_bvh_layout_mask() const override; void set_error(const string &error) override; diff --git a/intern/cycles/device/multi/device.cpp b/intern/cycles/device/multi/device.cpp index 56efec3e131..e319246d4f4 100644 --- a/intern/cycles/device/multi/device.cpp +++ b/intern/cycles/device/multi/device.cpp @@ -109,14 +109,6 @@ class MultiDevice : public Device { return error_msg; } - virtual bool show_samples() const override - { - if (devices.size() > 1) { - return false; - } - return devices.front().device->show_samples(); - } - virtual BVHLayoutMask get_bvh_layout_mask() const override { BVHLayoutMask bvh_layout_mask = BVH_LAYOUT_ALL; |