2011-04-27 11:58:34 +00:00
|
|
|
/*
|
2013-08-18 14:16:15 +00:00
|
|
|
* Copyright 2011-2013 Blender Foundation
|
2011-04-27 11:58:34 +00:00
|
|
|
*
|
2013-08-18 14:16:15 +00:00
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
2011-04-27 11:58:34 +00:00
|
|
|
*
|
2013-08-18 14:16:15 +00:00
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
2011-04-27 11:58:34 +00:00
|
|
|
*
|
2013-08-18 14:16:15 +00:00
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
2014-12-25 01:50:24 +00:00
|
|
|
* limitations under the License.
|
2011-04-27 11:58:34 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef __UTIL_PROGRESS_H__
|
|
|
|
#define __UTIL_PROGRESS_H__
|
|
|
|
|
|
|
|
/* Progress
|
|
|
|
*
|
|
|
|
* Simple class to communicate progress status messages, timing information,
|
|
|
|
* update notifications from a job running in another thread. All methods
|
|
|
|
* except for the constructor/destructor are thread safe. */
|
|
|
|
|
Cycles: Make all #include statements relative to cycles source directory
The idea is to make include statements more explicit and obvious where the
file is coming from, additionally reducing chance of wrong header being
picked up.
For example, it was not obvious whether bvh.h was refferring to builder
or traversal, whenter node.h is a generic graph node or a shader node
and cases like that.
Surely this might look obvious for the active developers, but after some
time of not touching the code it becomes less obvious where file is coming
from.
This was briefly mentioned in T50824 and seems @brecht is fine with such
explicitness, but need to agree with all active developers before committing
this.
Please note that this patch is lacking changes related on GPU/OpenCL
support. This will be solved if/when we all agree this is a good idea to move
forward.
Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner
Reviewed By: lukasstockner97, maiself, nirved, dingto
Subscribers: brecht
Differential Revision: https://developer.blender.org/D2586
2017-03-28 18:39:14 +00:00
|
|
|
#include "util/util_function.h"
|
|
|
|
#include "util/util_string.h"
|
|
|
|
#include "util/util_time.h"
|
|
|
|
#include "util/util_thread.h"
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
|
|
|
|
class Progress {
|
|
|
|
public:
|
|
|
|
Progress()
|
|
|
|
{
|
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
2016-11-26 03:22:34 +00:00
|
|
|
pixel_samples = 0;
|
|
|
|
total_pixel_samples = 0;
|
|
|
|
current_tile_sample = 0;
|
2017-05-19 01:27:38 +00:00
|
|
|
rendered_tiles = 0;
|
|
|
|
denoised_tiles = 0;
|
2012-01-09 16:57:46 +00:00
|
|
|
start_time = time_dt();
|
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
2016-11-26 03:22:34 +00:00
|
|
|
render_start_time = time_dt();
|
2011-04-27 11:58:34 +00:00
|
|
|
status = "Initializing";
|
|
|
|
substatus = "";
|
2012-09-28 12:37:20 +00:00
|
|
|
sync_status = "";
|
|
|
|
sync_substatus = "";
|
2015-03-30 10:06:20 +00:00
|
|
|
update_cb = function_null;
|
2011-04-27 11:58:34 +00:00
|
|
|
cancel = false;
|
|
|
|
cancel_message = "";
|
2014-12-05 16:17:48 +00:00
|
|
|
error = false;
|
|
|
|
error_message = "";
|
2015-03-30 10:06:20 +00:00
|
|
|
cancel_cb = function_null;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Progress(Progress& progress)
|
|
|
|
{
|
|
|
|
*this = progress;
|
|
|
|
}
|
|
|
|
|
|
|
|
Progress& operator=(Progress& progress)
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress.progress_mutex);
|
|
|
|
|
|
|
|
progress.get_status(status, substatus);
|
2012-09-04 13:29:07 +00:00
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
pixel_samples = progress.pixel_samples;
|
|
|
|
total_pixel_samples = progress.total_pixel_samples;
|
|
|
|
current_tile_sample = progress.get_current_sample();
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2012-11-09 08:46:53 +00:00
|
|
|
void reset()
|
|
|
|
{
|
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
2016-11-26 03:22:34 +00:00
|
|
|
pixel_samples = 0;
|
|
|
|
total_pixel_samples = 0;
|
|
|
|
current_tile_sample = 0;
|
2017-05-19 01:27:38 +00:00
|
|
|
rendered_tiles = 0;
|
|
|
|
denoised_tiles = 0;
|
2012-11-09 08:46:53 +00:00
|
|
|
start_time = time_dt();
|
2015-01-14 18:06:10 +00:00
|
|
|
render_start_time = time_dt();
|
2012-11-09 08:46:53 +00:00
|
|
|
status = "Initializing";
|
|
|
|
substatus = "";
|
|
|
|
sync_status = "";
|
|
|
|
sync_substatus = "";
|
|
|
|
cancel = false;
|
|
|
|
cancel_message = "";
|
2014-12-05 16:17:48 +00:00
|
|
|
error = false;
|
|
|
|
error_message = "";
|
2012-11-09 08:46:53 +00:00
|
|
|
}
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
/* cancel */
|
|
|
|
void set_cancel(const string& cancel_message_)
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
cancel_message = cancel_message_;
|
|
|
|
cancel = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool get_cancel()
|
|
|
|
{
|
|
|
|
if(!cancel && cancel_cb)
|
|
|
|
cancel_cb();
|
|
|
|
|
|
|
|
return cancel;
|
|
|
|
}
|
|
|
|
|
|
|
|
string get_cancel_message()
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
return cancel_message;
|
|
|
|
}
|
|
|
|
|
2015-03-29 20:12:22 +00:00
|
|
|
void set_cancel_callback(function<void(void)> function)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
|
|
|
cancel_cb = function;
|
|
|
|
}
|
|
|
|
|
2014-12-05 16:17:48 +00:00
|
|
|
/* error */
|
|
|
|
void set_error(const string& error_message_)
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
error_message = error_message_;
|
|
|
|
error = true;
|
|
|
|
/* If error happens we also stop rendering. */
|
|
|
|
cancel_message = error_message_;
|
|
|
|
cancel = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool get_error()
|
|
|
|
{
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
string get_error_message()
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
return error_message;
|
|
|
|
}
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
/* tile and timing information */
|
2011-04-27 11:58:34 +00:00
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
void set_start_time()
|
2012-01-09 16:57:46 +00:00
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
start_time = time_dt();
|
2012-01-09 16:57:46 +00:00
|
|
|
}
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
void set_render_start_time()
|
2015-01-14 18:06:10 +00:00
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
render_start_time = time_dt();
|
2015-01-14 18:06:10 +00:00
|
|
|
}
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
void add_skip_time(const scoped_timer &start_timer, bool only_render)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
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
2016-11-26 03:22:34 +00:00
|
|
|
double skip_time = time_dt() - start_timer.get_start();
|
2011-04-27 11:58:34 +00:00
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
render_start_time += skip_time;
|
|
|
|
if(!only_render) {
|
|
|
|
start_time += skip_time;
|
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
void get_time(double& total_time_, double& render_time_)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
total_time_ = time_dt() - start_time;
|
|
|
|
render_time_ = time_dt() - render_start_time;
|
2012-09-04 13:29:07 +00:00
|
|
|
}
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
void reset_sample()
|
2015-06-17 09:56:19 +00:00
|
|
|
{
|
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
2016-11-26 03:22:34 +00:00
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
|
|
|
|
pixel_samples = 0;
|
|
|
|
current_tile_sample = 0;
|
2017-05-19 01:27:38 +00:00
|
|
|
rendered_tiles = 0;
|
|
|
|
denoised_tiles = 0;
|
2015-06-17 09:56:19 +00:00
|
|
|
}
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
void set_total_pixel_samples(uint64_t total_pixel_samples_)
|
2012-09-04 13:29:07 +00:00
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
total_pixel_samples = total_pixel_samples_;
|
2012-09-04 13:29:07 +00:00
|
|
|
}
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
float get_progress()
|
|
|
|
{
|
|
|
|
if(total_pixel_samples > 0) {
|
|
|
|
return ((float) pixel_samples) / total_pixel_samples;
|
|
|
|
}
|
|
|
|
return 0.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
void add_samples(uint64_t pixel_samples_, int tile_sample)
|
2012-09-04 13:29:07 +00:00
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
pixel_samples += pixel_samples_;
|
|
|
|
current_tile_sample = tile_sample;
|
2012-09-04 13:29:07 +00:00
|
|
|
}
|
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
void add_samples_update(uint64_t pixel_samples_, int tile_sample)
|
2014-07-22 21:41:01 +00:00
|
|
|
{
|
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
2016-11-26 03:22:34 +00:00
|
|
|
add_samples(pixel_samples_, tile_sample);
|
2014-07-22 21:41:01 +00:00
|
|
|
set_update();
|
|
|
|
}
|
|
|
|
|
2017-05-19 01:27:38 +00:00
|
|
|
void add_finished_tile(bool denoised)
|
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
2016-11-26 03:22:34 +00:00
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
|
2017-05-19 01:27:38 +00:00
|
|
|
if(denoised) {
|
|
|
|
denoised_tiles++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rendered_tiles++;
|
|
|
|
}
|
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
2016-11-26 03:22:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int get_current_sample()
|
|
|
|
{
|
|
|
|
/* Note that the value here always belongs to the last tile that updated,
|
|
|
|
* so it's only useful if there is only one active tile. */
|
|
|
|
return current_tile_sample;
|
|
|
|
}
|
|
|
|
|
2017-05-19 01:27:38 +00:00
|
|
|
int get_rendered_tiles()
|
|
|
|
{
|
|
|
|
return rendered_tiles;
|
|
|
|
}
|
|
|
|
|
|
|
|
int get_denoised_tiles()
|
2012-09-04 13:29:07 +00:00
|
|
|
{
|
2017-05-19 01:27:38 +00:00
|
|
|
return denoised_tiles;
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* status messages */
|
|
|
|
|
|
|
|
void set_status(const string& status_, const string& substatus_ = "")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
status = status_;
|
|
|
|
substatus = substatus_;
|
|
|
|
}
|
|
|
|
|
|
|
|
set_update();
|
|
|
|
}
|
|
|
|
|
|
|
|
void set_substatus(const string& substatus_)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
substatus = substatus_;
|
|
|
|
}
|
|
|
|
|
|
|
|
set_update();
|
|
|
|
}
|
|
|
|
|
2012-09-28 12:37:20 +00:00
|
|
|
void set_sync_status(const string& status_, const string& substatus_ = "")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
sync_status = status_;
|
|
|
|
sync_substatus = substatus_;
|
|
|
|
}
|
|
|
|
|
|
|
|
set_update();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void set_sync_substatus(const string& substatus_)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
|
|
|
sync_substatus = substatus_;
|
|
|
|
}
|
|
|
|
|
|
|
|
set_update();
|
|
|
|
}
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
void get_status(string& status_, string& substatus_)
|
|
|
|
{
|
|
|
|
thread_scoped_lock lock(progress_mutex);
|
2012-09-28 12:37:20 +00:00
|
|
|
|
|
|
|
if(sync_status != "") {
|
|
|
|
status_ = sync_status;
|
|
|
|
substatus_ = sync_substatus;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
status_ = status;
|
|
|
|
substatus_ = substatus;
|
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* callback */
|
|
|
|
|
|
|
|
void set_update()
|
|
|
|
{
|
2012-05-08 19:57:56 +00:00
|
|
|
if(update_cb) {
|
|
|
|
thread_scoped_lock lock(update_mutex);
|
2011-04-27 11:58:34 +00:00
|
|
|
update_cb();
|
2012-05-08 19:57:56 +00:00
|
|
|
}
|
2011-04-27 11:58:34 +00:00
|
|
|
}
|
|
|
|
|
2015-03-29 20:12:22 +00:00
|
|
|
void set_update_callback(function<void(void)> function)
|
2011-04-27 11:58:34 +00:00
|
|
|
{
|
|
|
|
update_cb = function;
|
|
|
|
}
|
|
|
|
|
|
|
|
protected:
|
|
|
|
thread_mutex progress_mutex;
|
2012-05-08 19:57:56 +00:00
|
|
|
thread_mutex update_mutex;
|
2015-03-29 20:12:22 +00:00
|
|
|
function<void(void)> update_cb;
|
|
|
|
function<void(void)> cancel_cb;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
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
2016-11-26 03:22:34 +00:00
|
|
|
/* pixel_samples counts how many samples have been rendered over all pixel, not just per pixel.
|
|
|
|
* This makes the progress estimate more accurate when tiles with different sizes are used.
|
|
|
|
*
|
|
|
|
* total_pixel_samples is the total amount of pixel samples that will be rendered. */
|
|
|
|
uint64_t pixel_samples, total_pixel_samples;
|
|
|
|
/* Stores the current sample count of the last tile that called the update function.
|
|
|
|
* It's used to display the sample count if only one tile is active. */
|
|
|
|
int current_tile_sample;
|
|
|
|
/* Stores the number of tiles that's already finished.
|
|
|
|
* Used to determine whether all but the last tile are finished rendering, in which case the current_tile_sample is displayed. */
|
2017-05-19 01:27:38 +00:00
|
|
|
int rendered_tiles, denoised_tiles;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
2015-01-14 18:06:10 +00:00
|
|
|
double start_time, render_start_time;
|
2011-04-27 11:58:34 +00:00
|
|
|
|
|
|
|
string status;
|
|
|
|
string substatus;
|
|
|
|
|
2012-09-28 12:37:20 +00:00
|
|
|
string sync_status;
|
|
|
|
string sync_substatus;
|
|
|
|
|
2011-04-27 11:58:34 +00:00
|
|
|
volatile bool cancel;
|
|
|
|
string cancel_message;
|
2014-12-05 16:17:48 +00:00
|
|
|
|
|
|
|
volatile bool error;
|
|
|
|
string error_message;
|
2011-04-27 11:58:34 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
|
|
|
|
#endif /* __UTIL_PROGRESS_H__ */
|
|
|
|
|