Cycles: Refactor Progress system to provide better estimates
authorLukas Stockner <lukas.stockner@freenet.de>
Sat, 26 Nov 2016 03:22:34 +0000 (04:22 +0100)
committerLukas Stockner <lukas.stockner@freenet.de>
Sat, 3 Dec 2016 04:02:21 +0000 (05:02 +0100)
commita2ebc5268f2b98ee7335e0054c177c849a45cfba
treef1c08ab691cc93b08df0a387b037d1e0a45e9a53
parent35d490b3f13c75e9a62cb30f3842ed38a27f6dbc
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
19 files changed:
intern/cycles/app/cycles_standalone.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/device/device_network.cpp
intern/cycles/device/device_task.cpp
intern/cycles/device/device_task.h
intern/cycles/device/opencl/opencl_mega.cpp
intern/cycles/device/opencl/opencl_split.cpp
intern/cycles/render/bake.cpp
intern/cycles/render/bake.h
intern/cycles/render/session.cpp
intern/cycles/render/session.h
intern/cycles/render/tile.cpp
intern/cycles/render/tile.h
intern/cycles/util/util_progress.h
intern/cycles/util/util_time.h