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
88 lines
2.1 KiB
C++
88 lines
2.1 KiB
C++
/*
|
|
* 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
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __BAKE_H__
|
|
#define __BAKE_H__
|
|
|
|
#include "device.h"
|
|
#include "scene.h"
|
|
|
|
#include "util_progress.h"
|
|
#include "util_vector.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
class BakeData {
|
|
public:
|
|
BakeData(const int object, const size_t tri_offset, const size_t num_pixels);
|
|
~BakeData();
|
|
|
|
void set(int i, int prim, float uv[2], float dudx, float dudy, float dvdx, float dvdy);
|
|
void set_null(int i);
|
|
int object();
|
|
size_t size();
|
|
uint4 data(int i);
|
|
uint4 differentials(int i);
|
|
bool is_valid(int i);
|
|
|
|
private:
|
|
int m_object;
|
|
size_t m_tri_offset;
|
|
size_t m_num_pixels;
|
|
vector<int>m_primitive;
|
|
vector<float>m_u;
|
|
vector<float>m_v;
|
|
vector<float>m_dudx;
|
|
vector<float>m_dudy;
|
|
vector<float>m_dvdx;
|
|
vector<float>m_dvdy;
|
|
};
|
|
|
|
class BakeManager {
|
|
public:
|
|
BakeManager();
|
|
~BakeManager();
|
|
|
|
bool get_baking();
|
|
void set_baking(const bool value);
|
|
|
|
BakeData *init(const int object, const size_t tri_offset, const size_t num_pixels);
|
|
|
|
void set_shader_limit(const size_t x, const size_t y);
|
|
|
|
bool bake(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress, ShaderEvalType shader_type, const int pass_filter, BakeData *bake_data, float result[]);
|
|
|
|
void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
|
|
void device_free(Device *device, DeviceScene *dscene);
|
|
|
|
static int shader_type_to_pass_filter(ShaderEvalType type, const int pass_filter);
|
|
static bool is_aa_pass(ShaderEvalType type);
|
|
|
|
bool need_update;
|
|
|
|
int total_pixel_samples;
|
|
|
|
private:
|
|
BakeData *m_bake_data;
|
|
bool m_is_baking;
|
|
size_t m_shader_limit;
|
|
};
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* __BAKE_H__ */
|
|
|