2012-09-04 13:29:07 +00:00
|
|
|
/*
|
2013-08-18 14:16:15 +00:00
|
|
|
* Copyright 2011-2013 Blender Foundation
|
2012-09-04 13:29:07 +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
|
2012-09-04 13:29:07 +00:00
|
|
|
*
|
2013-08-18 14:16:15 +00:00
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
2012-09-04 13:29:07 +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.
|
2012-09-04 13:29:07 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef __DEVICE_TASK_H__
|
|
|
|
|
#define __DEVICE_TASK_H__
|
|
|
|
|
|
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 "device/device_memory.h"
|
2012-09-04 13:29:07 +00:00
|
|
|
|
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_list.h"
|
|
|
|
|
#include "util/util_task.h"
|
2012-09-04 13:29:07 +00:00
|
|
|
|
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
|
|
|
|
|
|
/* Device Task */
|
|
|
|
|
|
|
|
|
|
class Device;
|
|
|
|
|
class RenderBuffers;
|
|
|
|
|
class RenderTile;
|
|
|
|
|
class Tile;
|
|
|
|
|
|
|
|
|
|
class DeviceTask : public Task {
|
|
|
|
|
public:
|
2013-08-30 23:49:38 +00:00
|
|
|
typedef enum { PATH_TRACE, FILM_CONVERT, SHADER } Type;
|
2012-09-04 13:29:07 +00:00
|
|
|
Type type;
|
|
|
|
|
|
|
|
|
|
int x, y, w, h;
|
2013-08-30 23:49:38 +00:00
|
|
|
device_ptr rgba_byte;
|
|
|
|
|
device_ptr rgba_half;
|
2012-09-04 13:29:07 +00:00
|
|
|
device_ptr buffer;
|
|
|
|
|
int sample;
|
|
|
|
|
int num_samples;
|
|
|
|
|
int offset, stride;
|
|
|
|
|
|
|
|
|
|
device_ptr shader_input;
|
2015-12-30 14:04:01 +00:00
|
|
|
device_ptr shader_output, shader_output_luma;
|
2012-09-04 13:29:07 +00:00
|
|
|
int shader_eval_type;
|
2016-01-15 15:00:56 +00:00
|
|
|
int shader_filter;
|
2012-09-04 13:29:07 +00:00
|
|
|
int shader_x, shader_w;
|
|
|
|
|
|
2017-01-20 08:05:32 +00:00
|
|
|
int passes_size;
|
|
|
|
|
|
2016-05-11 14:50:10 +00:00
|
|
|
explicit DeviceTask(Type type = PATH_TRACE);
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2014-07-22 21:41:01 +00:00
|
|
|
int get_subtask_count(int num, int max_size = 0);
|
2014-05-26 11:40:16 +00:00
|
|
|
void split(list<DeviceTask>& tasks, int num, int max_size = 0);
|
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 update_progress(RenderTile *rtile, int pixel_samples = -1);
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2015-03-29 20:12:22 +00:00
|
|
|
function<bool(Device *device, RenderTile&)> acquire_tile;
|
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
|
|
|
function<void(long, int)> update_progress_sample;
|
2015-03-29 20:12:22 +00:00
|
|
|
function<void(RenderTile&)> update_tile_sample;
|
|
|
|
|
function<void(RenderTile&)> release_tile;
|
|
|
|
|
function<bool(void)> get_cancel;
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2012-10-13 12:38:32 +00:00
|
|
|
bool need_finish_queue;
|
2013-08-23 14:34:34 +00:00
|
|
|
bool integrator_branched;
|
2015-05-09 14:09:07 +00:00
|
|
|
int2 requested_tile_size;
|
2012-09-04 13:29:07 +00:00
|
|
|
protected:
|
|
|
|
|
double last_update_time;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
|
|
|
|
|
|
#endif /* __DEVICE_TASK_H__ */
|
|
|
|
|
|
