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
130 lines
2.7 KiB
C++
130 lines
2.7 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.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "device_task.h"
|
|
|
|
#include "buffers.h"
|
|
|
|
#include "util_algorithm.h"
|
|
#include "util_time.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* Device Task */
|
|
|
|
DeviceTask::DeviceTask(Type type_)
|
|
: type(type_), x(0), y(0), w(0), h(0), rgba_byte(0), rgba_half(0), buffer(0),
|
|
sample(0), num_samples(1),
|
|
shader_input(0), shader_output(0), shader_output_luma(0),
|
|
shader_eval_type(0), shader_filter(0), shader_x(0), shader_w(0)
|
|
{
|
|
last_update_time = time_dt();
|
|
}
|
|
|
|
int DeviceTask::get_subtask_count(int num, int max_size)
|
|
{
|
|
if(max_size != 0) {
|
|
int max_size_num;
|
|
|
|
if(type == SHADER) {
|
|
max_size_num = (shader_w + max_size - 1)/max_size;
|
|
}
|
|
else {
|
|
max_size = max(1, max_size/w);
|
|
max_size_num = (h + max_size - 1)/max_size;
|
|
}
|
|
|
|
num = max(max_size_num, num);
|
|
}
|
|
|
|
if(type == SHADER) {
|
|
num = min(shader_w, num);
|
|
}
|
|
else if(type == PATH_TRACE) {
|
|
}
|
|
else {
|
|
num = min(h, num);
|
|
}
|
|
|
|
return num;
|
|
}
|
|
|
|
void DeviceTask::split(list<DeviceTask>& tasks, int num, int max_size)
|
|
{
|
|
num = get_subtask_count(num, max_size);
|
|
|
|
if(type == SHADER) {
|
|
for(int i = 0; i < num; i++) {
|
|
int tx = shader_x + (shader_w/num)*i;
|
|
int tw = (i == num-1)? shader_w - i*(shader_w/num): shader_w/num;
|
|
|
|
DeviceTask task = *this;
|
|
|
|
task.shader_x = tx;
|
|
task.shader_w = tw;
|
|
|
|
tasks.push_back(task);
|
|
}
|
|
}
|
|
else if(type == PATH_TRACE) {
|
|
for(int i = 0; i < num; i++)
|
|
tasks.push_back(*this);
|
|
}
|
|
else {
|
|
for(int i = 0; i < num; i++) {
|
|
int ty = y + (h/num)*i;
|
|
int th = (i == num-1)? h - i*(h/num): h/num;
|
|
|
|
DeviceTask task = *this;
|
|
|
|
task.y = ty;
|
|
task.h = th;
|
|
|
|
tasks.push_back(task);
|
|
}
|
|
}
|
|
}
|
|
|
|
void DeviceTask::update_progress(RenderTile *rtile, int pixel_samples)
|
|
{
|
|
if((type != PATH_TRACE) &&
|
|
(type != SHADER))
|
|
return;
|
|
|
|
if(update_progress_sample) {
|
|
if(pixel_samples == -1) {
|
|
pixel_samples = shader_w;
|
|
}
|
|
update_progress_sample(pixel_samples, rtile? rtile->sample : 0);
|
|
}
|
|
|
|
if(update_tile_sample) {
|
|
double current_time = time_dt();
|
|
|
|
if(current_time - last_update_time >= 1.0) {
|
|
update_tile_sample(*rtile);
|
|
|
|
last_update_time = current_time;
|
|
}
|
|
}
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|
|
|