2014-01-02 21:05:07 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2011-2014 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
|
2014-12-25 01:50:24 +00:00
|
|
|
* limitations under the License.
|
2014-01-02 21:05: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 "render/bake.h"
|
|
|
|
#include "render/integrator.h"
|
2014-01-02 21:05:07 +00:00
|
|
|
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
|
2014-07-28 17:29:03 +00:00
|
|
|
BakeData::BakeData(const int object, const size_t tri_offset, const size_t num_pixels):
|
2014-01-02 21:05:07 +00:00
|
|
|
m_object(object),
|
|
|
|
m_tri_offset(tri_offset),
|
|
|
|
m_num_pixels(num_pixels)
|
|
|
|
{
|
|
|
|
m_primitive.resize(num_pixels);
|
|
|
|
m_u.resize(num_pixels);
|
|
|
|
m_v.resize(num_pixels);
|
2014-05-07 20:26:24 +00:00
|
|
|
m_dudx.resize(num_pixels);
|
|
|
|
m_dudy.resize(num_pixels);
|
|
|
|
m_dvdx.resize(num_pixels);
|
|
|
|
m_dvdy.resize(num_pixels);
|
2014-01-02 21:05:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BakeData::~BakeData()
|
|
|
|
{
|
|
|
|
m_primitive.clear();
|
|
|
|
m_u.clear();
|
|
|
|
m_v.clear();
|
2014-05-07 20:26:24 +00:00
|
|
|
m_dudx.clear();
|
|
|
|
m_dudy.clear();
|
|
|
|
m_dvdx.clear();
|
|
|
|
m_dvdy.clear();
|
2014-01-02 21:05:07 +00:00
|
|
|
}
|
|
|
|
|
2014-05-07 20:26:24 +00:00
|
|
|
void BakeData::set(int i, int prim, float uv[2], float dudx, float dudy, float dvdx, float dvdy)
|
2014-01-02 21:05:07 +00:00
|
|
|
{
|
|
|
|
m_primitive[i] = (prim == -1 ? -1 : m_tri_offset + prim);
|
|
|
|
m_u[i] = uv[0];
|
|
|
|
m_v[i] = uv[1];
|
2014-05-07 20:26:24 +00:00
|
|
|
m_dudx[i] = dudx;
|
|
|
|
m_dudy[i] = dudy;
|
|
|
|
m_dvdx[i] = dvdx;
|
|
|
|
m_dvdy[i] = dvdy;
|
2014-01-02 21:05:07 +00:00
|
|
|
}
|
|
|
|
|
2015-04-17 15:25:37 +00:00
|
|
|
void BakeData::set_null(int i)
|
|
|
|
{
|
|
|
|
m_primitive[i] = -1;
|
|
|
|
}
|
|
|
|
|
2014-01-02 21:05:07 +00:00
|
|
|
int BakeData::object()
|
|
|
|
{
|
|
|
|
return m_object;
|
|
|
|
}
|
|
|
|
|
2014-07-28 17:29:03 +00:00
|
|
|
size_t BakeData::size()
|
2014-01-02 21:05:07 +00:00
|
|
|
{
|
|
|
|
return m_num_pixels;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool BakeData::is_valid(int i)
|
|
|
|
{
|
|
|
|
return m_primitive[i] != -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint4 BakeData::data(int i)
|
|
|
|
{
|
|
|
|
return make_uint4(
|
|
|
|
m_object,
|
|
|
|
m_primitive[i],
|
|
|
|
__float_as_int(m_u[i]),
|
|
|
|
__float_as_int(m_v[i])
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2014-05-07 20:26:24 +00:00
|
|
|
uint4 BakeData::differentials(int i)
|
|
|
|
{
|
|
|
|
return make_uint4(
|
|
|
|
__float_as_int(m_dudx[i]),
|
|
|
|
__float_as_int(m_dudy[i]),
|
|
|
|
__float_as_int(m_dvdx[i]),
|
|
|
|
__float_as_int(m_dvdy[i])
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2014-01-02 21:05:07 +00:00
|
|
|
BakeManager::BakeManager()
|
|
|
|
{
|
|
|
|
m_bake_data = NULL;
|
|
|
|
m_is_baking = false;
|
|
|
|
need_update = true;
|
2014-07-31 23:04:57 +00:00
|
|
|
m_shader_limit = 512 * 512;
|
2014-01-02 21:05:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BakeManager::~BakeManager()
|
|
|
|
{
|
|
|
|
if(m_bake_data)
|
|
|
|
delete m_bake_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool BakeManager::get_baking()
|
|
|
|
{
|
|
|
|
return m_is_baking;
|
|
|
|
}
|
|
|
|
|
|
|
|
void BakeManager::set_baking(const bool value)
|
|
|
|
{
|
|
|
|
m_is_baking = value;
|
|
|
|
}
|
|
|
|
|
2014-07-28 17:29:03 +00:00
|
|
|
BakeData *BakeManager::init(const int object, const size_t tri_offset, const size_t num_pixels)
|
2014-01-02 21:05:07 +00:00
|
|
|
{
|
|
|
|
m_bake_data = new BakeData(object, tri_offset, num_pixels);
|
|
|
|
return m_bake_data;
|
|
|
|
}
|
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
void BakeManager::set_shader_limit(const size_t x, const size_t y)
|
|
|
|
{
|
|
|
|
m_shader_limit = x * y;
|
2014-08-15 13:44:50 +00:00
|
|
|
m_shader_limit = (size_t)pow(2, ceil(log(m_shader_limit)/log(2)));
|
2014-07-31 23:04:57 +00:00
|
|
|
}
|
|
|
|
|
2016-01-15 15:00:56 +00:00
|
|
|
bool BakeManager::bake(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress, ShaderEvalType shader_type, const int pass_filter, BakeData *bake_data, float result[])
|
2014-01-02 21:05:07 +00:00
|
|
|
{
|
2014-07-31 23:04:57 +00:00
|
|
|
size_t num_pixels = bake_data->size();
|
2014-01-02 21:05: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
|
|
|
int num_samples = is_aa_pass(shader_type)? scene->integrator->aa_samples : 1;
|
2014-01-02 21:05: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
|
|
|
/* calculate the total pixel samples for the progress bar */
|
|
|
|
total_pixel_samples = 0;
|
2014-07-31 23:04:57 +00:00
|
|
|
for(size_t shader_offset = 0; shader_offset < num_pixels; shader_offset += m_shader_limit) {
|
2014-08-15 13:44:50 +00:00
|
|
|
size_t shader_size = (size_t)fminf(num_pixels - shader_offset, m_shader_limit);
|
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 += shader_size * num_samples;
|
2014-07-31 23:04:57 +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
|
|
|
progress.reset_sample();
|
|
|
|
progress.set_total_pixel_samples(total_pixel_samples);
|
2014-01-02 21:05:07 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
for(size_t shader_offset = 0; shader_offset < num_pixels; shader_offset += m_shader_limit) {
|
2014-08-15 13:44:50 +00:00
|
|
|
size_t shader_size = (size_t)fminf(num_pixels - shader_offset, m_shader_limit);
|
2014-01-02 21:05:07 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
/* setup input for device task */
|
|
|
|
device_vector<uint4> d_input;
|
|
|
|
uint4 *d_input_data = d_input.resize(shader_size * 2);
|
|
|
|
size_t d_input_size = 0;
|
2014-07-22 21:41:01 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
for(size_t i = shader_offset; i < (shader_offset + shader_size); i++) {
|
|
|
|
d_input_data[d_input_size++] = bake_data->data(i);
|
|
|
|
d_input_data[d_input_size++] = bake_data->differentials(i);
|
|
|
|
}
|
2014-01-02 21:05:07 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
if(d_input_size == 0) {
|
|
|
|
m_is_baking = false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* run device task */
|
|
|
|
device_vector<float4> d_output;
|
|
|
|
d_output.resize(shader_size);
|
|
|
|
|
|
|
|
/* needs to be up to data for attribute access */
|
|
|
|
device->const_copy_to("__data", &dscene->data, sizeof(dscene->data));
|
|
|
|
|
2016-12-14 01:45:09 +00:00
|
|
|
device->mem_alloc("bake_input", d_input, MEM_READ_ONLY);
|
2014-07-31 23:04:57 +00:00
|
|
|
device->mem_copy_to(d_input);
|
2016-12-14 01:45:09 +00:00
|
|
|
device->mem_alloc("bake_output", d_output, MEM_READ_WRITE);
|
2014-07-31 23:04:57 +00:00
|
|
|
|
|
|
|
DeviceTask task(DeviceTask::SHADER);
|
|
|
|
task.shader_input = d_input.device_pointer;
|
|
|
|
task.shader_output = d_output.device_pointer;
|
|
|
|
task.shader_eval_type = shader_type;
|
2016-01-15 15:00:56 +00:00
|
|
|
task.shader_filter = pass_filter;
|
2014-07-31 23:04:57 +00:00
|
|
|
task.shader_x = 0;
|
2014-08-19 09:39:40 +00:00
|
|
|
task.offset = shader_offset;
|
2014-07-31 23:04:57 +00:00
|
|
|
task.shader_w = d_output.size();
|
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
|
|
|
task.num_samples = num_samples;
|
2014-07-31 23:04:57 +00:00
|
|
|
task.get_cancel = function_bind(&Progress::get_cancel, &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
|
|
|
task.update_progress_sample = function_bind(&Progress::add_samples_update, &progress, _1, _2);
|
2014-07-31 23:04:57 +00:00
|
|
|
|
|
|
|
device->task_add(task);
|
|
|
|
device->task_wait();
|
|
|
|
|
|
|
|
if(progress.get_cancel()) {
|
|
|
|
device->mem_free(d_input);
|
|
|
|
device->mem_free(d_output);
|
|
|
|
m_is_baking = false;
|
|
|
|
return false;
|
|
|
|
}
|
2014-01-02 21:05:07 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
device->mem_copy_from(d_output, 0, 1, d_output.size(), sizeof(float4));
|
2014-01-02 21:05:07 +00:00
|
|
|
device->mem_free(d_input);
|
|
|
|
device->mem_free(d_output);
|
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
/* read result */
|
|
|
|
int k = 0;
|
2014-01-02 21:05:07 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
float4 *offset = (float4*)d_output.data_pointer;
|
2014-01-02 21:05:07 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
size_t depth = 4;
|
|
|
|
for(size_t i=shader_offset; i < (shader_offset + shader_size); i++) {
|
|
|
|
size_t index = i * depth;
|
|
|
|
float4 out = offset[k++];
|
2014-01-02 21:05:07 +00:00
|
|
|
|
2014-07-31 23:04:57 +00:00
|
|
|
if(bake_data->is_valid(i)) {
|
|
|
|
for(size_t j=0; j < 4; j++) {
|
|
|
|
result[index + j] = out[j];
|
|
|
|
}
|
2014-01-02 21:05:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
m_is_baking = false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-03-27 10:47:55 +00:00
|
|
|
void BakeManager::device_update(Device * /*device*/,
|
|
|
|
DeviceScene * /*dscene*/,
|
|
|
|
Scene * /*scene*/,
|
|
|
|
Progress& progress)
|
2014-01-02 21:05:07 +00:00
|
|
|
{
|
|
|
|
if(!need_update)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if(progress.get_cancel()) return;
|
|
|
|
|
|
|
|
need_update = false;
|
|
|
|
}
|
|
|
|
|
2015-03-27 10:47:55 +00:00
|
|
|
void BakeManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/)
|
2014-01-02 21:05:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-06-06 12:40:09 +00:00
|
|
|
bool BakeManager::is_aa_pass(ShaderEvalType type)
|
|
|
|
{
|
|
|
|
switch(type) {
|
|
|
|
case SHADER_EVAL_UV:
|
|
|
|
case SHADER_EVAL_NORMAL:
|
|
|
|
return false;
|
|
|
|
default:
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-06 19:35:36 +00:00
|
|
|
/* Keep it synced with kernel_bake.h logic */
|
|
|
|
int BakeManager::shader_type_to_pass_filter(ShaderEvalType type, const int pass_filter)
|
2014-06-06 12:40:09 +00:00
|
|
|
{
|
2016-02-06 19:35:36 +00:00
|
|
|
const int component_flags = pass_filter & (BAKE_FILTER_DIRECT | BAKE_FILTER_INDIRECT | BAKE_FILTER_COLOR);
|
|
|
|
|
2014-06-06 12:40:09 +00:00
|
|
|
switch(type) {
|
|
|
|
case SHADER_EVAL_AO:
|
2016-02-06 19:35:36 +00:00
|
|
|
return BAKE_FILTER_AO;
|
2014-06-06 12:40:09 +00:00
|
|
|
case SHADER_EVAL_SHADOW:
|
2016-02-06 19:35:36 +00:00
|
|
|
return BAKE_FILTER_DIRECT;
|
2016-01-15 15:00:56 +00:00
|
|
|
case SHADER_EVAL_DIFFUSE:
|
2016-02-06 19:35:36 +00:00
|
|
|
return BAKE_FILTER_DIFFUSE | component_flags;
|
2016-01-15 15:00:56 +00:00
|
|
|
case SHADER_EVAL_GLOSSY:
|
2016-02-06 19:35:36 +00:00
|
|
|
return BAKE_FILTER_GLOSSY | component_flags;
|
2016-01-15 15:00:56 +00:00
|
|
|
case SHADER_EVAL_TRANSMISSION:
|
2016-02-06 19:35:36 +00:00
|
|
|
return BAKE_FILTER_TRANSMISSION | component_flags;
|
2016-01-15 15:00:56 +00:00
|
|
|
case SHADER_EVAL_SUBSURFACE:
|
2016-02-06 19:35:36 +00:00
|
|
|
return BAKE_FILTER_SUBSURFACE | component_flags;
|
2016-01-15 15:00:56 +00:00
|
|
|
case SHADER_EVAL_COMBINED:
|
2016-02-06 19:35:36 +00:00
|
|
|
return pass_filter;
|
2014-06-06 12:40:09 +00:00
|
|
|
default:
|
2016-02-06 19:35:36 +00:00
|
|
|
return 0;
|
2014-06-06 12:40:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-02 21:05:07 +00:00
|
|
|
CCL_NAMESPACE_END
|