forked from bartvdbraak/blender
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
78 lines
1.8 KiB
C++
78 lines
1.8 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 __DEVICE_TASK_H__
|
|
#define __DEVICE_TASK_H__
|
|
|
|
#include "device_memory.h"
|
|
|
|
#include "util_function.h"
|
|
#include "util_list.h"
|
|
#include "util_task.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* Device Task */
|
|
|
|
class Device;
|
|
class RenderBuffers;
|
|
class RenderTile;
|
|
class Tile;
|
|
|
|
class DeviceTask : public Task {
|
|
public:
|
|
typedef enum { PATH_TRACE, FILM_CONVERT, SHADER } Type;
|
|
Type type;
|
|
|
|
int x, y, w, h;
|
|
device_ptr rgba_byte;
|
|
device_ptr rgba_half;
|
|
device_ptr buffer;
|
|
int sample;
|
|
int num_samples;
|
|
int offset, stride;
|
|
|
|
device_ptr shader_input;
|
|
device_ptr shader_output, shader_output_luma;
|
|
int shader_eval_type;
|
|
int shader_filter;
|
|
int shader_x, shader_w;
|
|
|
|
explicit DeviceTask(Type type = PATH_TRACE);
|
|
|
|
int get_subtask_count(int num, int max_size = 0);
|
|
void split(list<DeviceTask>& tasks, int num, int max_size = 0);
|
|
|
|
void update_progress(RenderTile *rtile, int pixel_samples = -1);
|
|
|
|
function<bool(Device *device, RenderTile&)> acquire_tile;
|
|
function<void(long, int)> update_progress_sample;
|
|
function<void(RenderTile&)> update_tile_sample;
|
|
function<void(RenderTile&)> release_tile;
|
|
function<bool(void)> get_cancel;
|
|
|
|
bool need_finish_queue;
|
|
bool integrator_branched;
|
|
int2 requested_tile_size;
|
|
protected:
|
|
double last_update_time;
|
|
};
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* __DEVICE_TASK_H__ */
|
|
|