From a2ebc5268f2b98ee7335e0054c177c849a45cfba Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Sat, 26 Nov 2016 04:22:34 +0100 Subject: Cycles: Refactor Progress system to provide better estimates The Progress system in Cycles had two limitations so far: - It just counted tiles, but ignored their size. For example, when rendering a 600x500 image with 512x512 tiles, the right 88x500 tile would count for 50% of the progress, although it only covers 15% of the image. - Scene update time was incorrectly counted as rendering time - therefore, the remaining time started very long and gradually decreased. This patch fixes both problems: First of all, the Progress now has a function to ignore time spans, and that is used to ignore scene update time. The larger change is the tile size: Instead of counting samples per tile, so that the final value is num_samples*num_tiles, the code now counts every sample for every pixel, so that the final value is num_samples*num_pixels. Along with that, some unused variables were removed from the Progress and Session classes. Reviewers: brecht, sergey, #cycles Subscribers: brecht, candreacchio, sergey Differential Revision: https://developer.blender.org/D2214 --- intern/cycles/device/device.h | 1 + 1 file changed, 1 insertion(+) (limited to 'intern/cycles/device/device.h') diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index b9bdffa2618..988ad10607d 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -220,6 +220,7 @@ public: DeviceInfo info; virtual const string& error_message() { return error_msg; } bool have_error() { return !error_message().empty(); } + virtual bool show_samples() const { return false; } /* statistics */ Stats &stats; -- cgit v1.2.3