Blender Git Loki

Git Commits -> Revision a2ebc52

Revision a2ebc52 by Lukas Stockner (master)
December 3, 2016, 04:02 (GMT)
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

Commit Details:

Full Hash: a2ebc5268f2b98ee7335e0054c177c849a45cfba
Parent Commit: 35d490b
Lines Changed: +216, -204

19 Modified Paths:

/intern/cycles/app/cycles_standalone.cpp (+7, -11) (Diff)
/intern/cycles/blender/blender_session.cpp (+3, -28) (Diff)
/intern/cycles/device/device.h (+1, -0) (Diff)
/intern/cycles/device/device_cpu.cpp (+6, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+7, -1) (Diff)
/intern/cycles/device/device_multi.cpp (+8, -0) (Diff)
/intern/cycles/device/device_network.cpp (+5, -0) (Diff)
/intern/cycles/device/device_task.cpp (+9, -3) (Diff)
/intern/cycles/device/device_task.h (+2, -2) (Diff)
/intern/cycles/device/opencl/opencl_mega.cpp (+5, -1) (Diff)
/intern/cycles/device/opencl/opencl_split.cpp (+4, -0) (Diff)
/intern/cycles/render/bake.cpp (+8, -12) (Diff)
/intern/cycles/render/bake.h (+1, -2) (Diff)
/intern/cycles/render/session.cpp (+32, -78) (Diff)
/intern/cycles/render/session.h (+4, -5) (Diff)
/intern/cycles/render/tile.cpp (+29, -8) (Diff)
/intern/cycles/render/tile.h (+5, -1) (Diff)
/intern/cycles/util/util_progress.h (+73, -50) (Diff)
/intern/cycles/util/util_time.h (+7, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021