a2ebc5268f
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
58 lines
1.2 KiB
C++
58 lines
1.2 KiB
C++
/*
|
|
* Copyright 2011-2013 Blender Foundation
|
|
*
|
|
* 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
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* 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
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __UTIL_TIME_H__
|
|
#define __UTIL_TIME_H__
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* Give current time in seconds in double precision, with good accuracy. */
|
|
|
|
double time_dt();
|
|
|
|
/* Sleep for the specified number of seconds */
|
|
|
|
void time_sleep(double t);
|
|
|
|
class scoped_timer {
|
|
public:
|
|
explicit scoped_timer(double *value = NULL) : value_(value)
|
|
{
|
|
time_start_ = time_dt();
|
|
}
|
|
|
|
~scoped_timer()
|
|
{
|
|
if(value_ != NULL) {
|
|
*value_ = time_dt() - time_start_;
|
|
}
|
|
}
|
|
|
|
double get_start() const
|
|
{
|
|
return time_start_;
|
|
}
|
|
|
|
protected:
|
|
double *value_;
|
|
double time_start_;
|
|
};
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif
|
|
|