diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2015-01-14 21:06:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-14 21:14:16 +0300 |
| commit | 193871ae7da35548688d7b9ccadde66e4f35d2fd (patch) | |
| tree | a3c16ab2d05f58f16042dd2b6fbb3d318f1ecfb4 /intern/cycles/render/session.cpp | |
| parent | 0d6e88b446d667f66bd63d5cdcbdc91339575bf1 (diff) | |
Cycles: Ignore preprocessing time in ETA calculation
This patch makes Cycles ignore the time spent in BVH construction etc. when
estimating the remaining time. Considering that the remaining time is calculated
based on the average time per tile so far, as far as I understand it makes no
sense to include the preprocessing time.
Reviewers: sergey, #cycles
Reviewed By: sergey, #cycles
Subscribers: sergey
Projects: #cycles
Differential Revision: https://developer.blender.org/D895
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 308d04c50eb..c633f4b8497 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -199,8 +199,7 @@ void Session::run_gpu() paused_time = 0.0; last_update_time = time_dt(); - if(!params.background) - progress.set_start_time(start_time + paused_time); + progress.set_render_start_time(start_time + paused_time); while(!progress.get_cancel()) { /* advance to next tile */ @@ -233,6 +232,7 @@ void Session::run_gpu() if(!params.background) progress.set_start_time(start_time + paused_time); + progress.set_render_start_time(start_time + paused_time); update_status_time(pause, no_tiles); progress.set_update(); @@ -517,6 +517,7 @@ void Session::run_cpu() if(!params.background) progress.set_start_time(start_time + paused_time); + progress.set_render_start_time(start_time + paused_time); update_status_time(pause, no_tiles); progress.set_update(); @@ -665,7 +666,8 @@ void Session::reset_(BufferParams& buffer_params, int samples) paused_time = 0.0; if(!params.background) - progress.set_start_time(start_time + paused_time); + progress.set_start_time(start_time); + progress.set_render_start_time(start_time); } void Session::reset(BufferParams& buffer_params, int samples) |