forked from bartvdbraak/blender
Fix T52135: Cycles should not keep generated/packed images in memory after render.
This commit is contained in:
parent
a4cd7b7297
commit
2b132fc3f7
@ -129,9 +129,9 @@ void BlenderSession::create_session()
|
|||||||
scene = new Scene(scene_params, session_params.device);
|
scene = new Scene(scene_params, session_params.device);
|
||||||
|
|
||||||
/* setup callbacks for builtin image support */
|
/* setup callbacks for builtin image support */
|
||||||
scene->image_manager->builtin_image_info_cb = function_bind(&BlenderSession::builtin_image_info, this, _1, _2, _3, _4, _5, _6, _7);
|
scene->image_manager->builtin_image_info_cb = function_bind(&BlenderSession::builtin_image_info, this, _1, _2, _3, _4, _5, _6, _7, _8);
|
||||||
scene->image_manager->builtin_image_pixels_cb = function_bind(&BlenderSession::builtin_image_pixels, this, _1, _2, _3, _4);
|
scene->image_manager->builtin_image_pixels_cb = function_bind(&BlenderSession::builtin_image_pixels, this, _1, _2, _3, _4, _5);
|
||||||
scene->image_manager->builtin_image_float_pixels_cb = function_bind(&BlenderSession::builtin_image_float_pixels, this, _1, _2, _3, _4);
|
scene->image_manager->builtin_image_float_pixels_cb = function_bind(&BlenderSession::builtin_image_float_pixels, this, _1, _2, _3, _4, _5);
|
||||||
|
|
||||||
/* create session */
|
/* create session */
|
||||||
session = new Session(session_params);
|
session = new Session(session_params);
|
||||||
@ -1013,7 +1013,8 @@ void BlenderSession::builtin_image_info(const string &builtin_name,
|
|||||||
int &width,
|
int &width,
|
||||||
int &height,
|
int &height,
|
||||||
int &depth,
|
int &depth,
|
||||||
int &channels)
|
int &channels,
|
||||||
|
bool& free_cache)
|
||||||
{
|
{
|
||||||
/* empty image */
|
/* empty image */
|
||||||
is_float = false;
|
is_float = false;
|
||||||
@ -1021,6 +1022,7 @@ void BlenderSession::builtin_image_info(const string &builtin_name,
|
|||||||
height = 1;
|
height = 1;
|
||||||
depth = 0;
|
depth = 0;
|
||||||
channels = 0;
|
channels = 0;
|
||||||
|
free_cache = false;
|
||||||
|
|
||||||
if(!builtin_data)
|
if(!builtin_data)
|
||||||
return;
|
return;
|
||||||
@ -1034,6 +1036,7 @@ void BlenderSession::builtin_image_info(const string &builtin_name,
|
|||||||
/* image data */
|
/* image data */
|
||||||
BL::Image b_image(b_id);
|
BL::Image b_image(b_id);
|
||||||
|
|
||||||
|
free_cache = !b_image.has_data();
|
||||||
is_float = b_image.is_float();
|
is_float = b_image.is_float();
|
||||||
width = b_image.size()[0];
|
width = b_image.size()[0];
|
||||||
height = b_image.size()[1];
|
height = b_image.size()[1];
|
||||||
@ -1094,7 +1097,8 @@ void BlenderSession::builtin_image_info(const string &builtin_name,
|
|||||||
bool BlenderSession::builtin_image_pixels(const string &builtin_name,
|
bool BlenderSession::builtin_image_pixels(const string &builtin_name,
|
||||||
void *builtin_data,
|
void *builtin_data,
|
||||||
unsigned char *pixels,
|
unsigned char *pixels,
|
||||||
const size_t pixels_size)
|
const size_t pixels_size,
|
||||||
|
const bool free_cache)
|
||||||
{
|
{
|
||||||
if(!builtin_data) {
|
if(!builtin_data) {
|
||||||
return false;
|
return false;
|
||||||
@ -1138,6 +1142,11 @@ bool BlenderSession::builtin_image_pixels(const string &builtin_name,
|
|||||||
MEM_freeN(image_pixels);
|
MEM_freeN(image_pixels);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Free image buffers to save memory during render. */
|
||||||
|
if(free_cache) {
|
||||||
|
b_image.buffers_free();
|
||||||
|
}
|
||||||
|
|
||||||
/* Premultiply, byte images are always straight for Blender. */
|
/* Premultiply, byte images are always straight for Blender. */
|
||||||
unsigned char *cp = pixels;
|
unsigned char *cp = pixels;
|
||||||
for(size_t i = 0; i < num_pixels; i++, cp += channels) {
|
for(size_t i = 0; i < num_pixels; i++, cp += channels) {
|
||||||
@ -1151,7 +1160,8 @@ bool BlenderSession::builtin_image_pixels(const string &builtin_name,
|
|||||||
bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
|
bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
|
||||||
void *builtin_data,
|
void *builtin_data,
|
||||||
float *pixels,
|
float *pixels,
|
||||||
const size_t pixels_size)
|
const size_t pixels_size,
|
||||||
|
const bool free_cache)
|
||||||
{
|
{
|
||||||
if(!builtin_data) {
|
if(!builtin_data) {
|
||||||
return false;
|
return false;
|
||||||
@ -1199,6 +1209,11 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
|
|||||||
MEM_freeN(image_pixels);
|
MEM_freeN(image_pixels);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Free image buffers to save memory during render. */
|
||||||
|
if(free_cache) {
|
||||||
|
b_image.buffers_free();
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if(b_id.is_a(&RNA_Object)) {
|
else if(b_id.is_a(&RNA_Object)) {
|
||||||
|
@ -156,15 +156,18 @@ protected:
|
|||||||
int &width,
|
int &width,
|
||||||
int &height,
|
int &height,
|
||||||
int &depth,
|
int &depth,
|
||||||
int &channels);
|
int &channels,
|
||||||
|
bool &free_cache);
|
||||||
bool builtin_image_pixels(const string &builtin_name,
|
bool builtin_image_pixels(const string &builtin_name,
|
||||||
void *builtin_data,
|
void *builtin_data,
|
||||||
unsigned char *pixels,
|
unsigned char *pixels,
|
||||||
const size_t pixels_size);
|
const size_t pixels_size,
|
||||||
|
const bool free_cache);
|
||||||
bool builtin_image_float_pixels(const string &builtin_name,
|
bool builtin_image_float_pixels(const string &builtin_name,
|
||||||
void *builtin_data,
|
void *builtin_data,
|
||||||
float *pixels,
|
float *pixels,
|
||||||
const size_t pixels_size);
|
const size_t pixels_size,
|
||||||
|
const bool free_cache);
|
||||||
|
|
||||||
/* Update tile manager to reflect resumable render settings. */
|
/* Update tile manager to reflect resumable render settings. */
|
||||||
void update_resumable_tile_manager(int num_samples);
|
void update_resumable_tile_manager(int num_samples);
|
||||||
|
@ -115,16 +115,18 @@ bool ImageManager::set_animation_frame_update(int frame)
|
|||||||
|
|
||||||
ImageDataType ImageManager::get_image_metadata(const string& filename,
|
ImageDataType ImageManager::get_image_metadata(const string& filename,
|
||||||
void *builtin_data,
|
void *builtin_data,
|
||||||
bool& is_linear)
|
bool& is_linear,
|
||||||
|
bool& builtin_free_cache)
|
||||||
{
|
{
|
||||||
bool is_float = false, is_half = false;
|
bool is_float = false, is_half = false;
|
||||||
is_linear = false;
|
is_linear = false;
|
||||||
|
builtin_free_cache = false;
|
||||||
int channels = 4;
|
int channels = 4;
|
||||||
|
|
||||||
if(builtin_data) {
|
if(builtin_data) {
|
||||||
if(builtin_image_info_cb) {
|
if(builtin_image_info_cb) {
|
||||||
int width, height, depth;
|
int width, height, depth;
|
||||||
builtin_image_info_cb(filename, builtin_data, is_float, width, height, depth, channels);
|
builtin_image_info_cb(filename, builtin_data, is_float, width, height, depth, channels, builtin_free_cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_float) {
|
if(is_float) {
|
||||||
@ -272,8 +274,9 @@ int ImageManager::add_image(const string& filename,
|
|||||||
{
|
{
|
||||||
Image *img;
|
Image *img;
|
||||||
size_t slot;
|
size_t slot;
|
||||||
|
bool builtin_free_cache;
|
||||||
|
|
||||||
ImageDataType type = get_image_metadata(filename, builtin_data, is_linear);
|
ImageDataType type = get_image_metadata(filename, builtin_data, is_linear, builtin_free_cache);
|
||||||
|
|
||||||
thread_scoped_lock device_lock(device_mutex);
|
thread_scoped_lock device_lock(device_mutex);
|
||||||
|
|
||||||
@ -359,6 +362,7 @@ int ImageManager::add_image(const string& filename,
|
|||||||
img = new Image();
|
img = new Image();
|
||||||
img->filename = filename;
|
img->filename = filename;
|
||||||
img->builtin_data = builtin_data;
|
img->builtin_data = builtin_data;
|
||||||
|
img->builtin_free_cache = builtin_free_cache;
|
||||||
img->need_load = true;
|
img->need_load = true;
|
||||||
img->animated = animated;
|
img->animated = animated;
|
||||||
img->frame = frame;
|
img->frame = frame;
|
||||||
@ -444,7 +448,12 @@ void ImageManager::tag_reload_image(const string& filename,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ImageManager::file_load_image_generic(Image *img, ImageInput **in, int &width, int &height, int &depth, int &components)
|
bool ImageManager::file_load_image_generic(Image *img,
|
||||||
|
ImageInput **in,
|
||||||
|
int &width,
|
||||||
|
int &height,
|
||||||
|
int &depth,
|
||||||
|
int &components)
|
||||||
{
|
{
|
||||||
if(img->filename == "")
|
if(img->filename == "")
|
||||||
return false;
|
return false;
|
||||||
@ -483,8 +492,8 @@ bool ImageManager::file_load_image_generic(Image *img, ImageInput **in, int &wid
|
|||||||
if(!builtin_image_info_cb || !builtin_image_pixels_cb)
|
if(!builtin_image_info_cb || !builtin_image_pixels_cb)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
bool is_float;
|
bool is_float, free_cache;
|
||||||
builtin_image_info_cb(img->filename, img->builtin_data, is_float, width, height, depth, components);
|
builtin_image_info_cb(img->filename, img->builtin_data, is_float, width, height, depth, components, free_cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* we only handle certain number of components */
|
/* we only handle certain number of components */
|
||||||
@ -565,13 +574,15 @@ bool ImageManager::file_load_image(Image *img,
|
|||||||
builtin_image_float_pixels_cb(img->filename,
|
builtin_image_float_pixels_cb(img->filename,
|
||||||
img->builtin_data,
|
img->builtin_data,
|
||||||
(float*)&pixels[0],
|
(float*)&pixels[0],
|
||||||
num_pixels * components);
|
num_pixels * components,
|
||||||
|
img->builtin_free_cache);
|
||||||
}
|
}
|
||||||
else if(FileFormat == TypeDesc::UINT8) {
|
else if(FileFormat == TypeDesc::UINT8) {
|
||||||
builtin_image_pixels_cb(img->filename,
|
builtin_image_pixels_cb(img->filename,
|
||||||
img->builtin_data,
|
img->builtin_data,
|
||||||
(uchar*)&pixels[0],
|
(uchar*)&pixels[0],
|
||||||
num_pixels * components);
|
num_pixels * components,
|
||||||
|
img->builtin_free_cache);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* TODO(dingto): Support half for ImBuf. */
|
/* TODO(dingto): Support half for ImBuf. */
|
||||||
|
@ -57,7 +57,10 @@ public:
|
|||||||
InterpolationType interpolation,
|
InterpolationType interpolation,
|
||||||
ExtensionType extension,
|
ExtensionType extension,
|
||||||
bool use_alpha);
|
bool use_alpha);
|
||||||
ImageDataType get_image_metadata(const string& filename, void *builtin_data, bool& is_linear);
|
ImageDataType get_image_metadata(const string& filename,
|
||||||
|
void *builtin_data,
|
||||||
|
bool& is_linear,
|
||||||
|
bool& builtin_free_cache);
|
||||||
|
|
||||||
void device_prepare_update(DeviceScene *dscene);
|
void device_prepare_update(DeviceScene *dscene);
|
||||||
void device_update(Device *device,
|
void device_update(Device *device,
|
||||||
@ -88,19 +91,23 @@ public:
|
|||||||
int &width,
|
int &width,
|
||||||
int &height,
|
int &height,
|
||||||
int &depth,
|
int &depth,
|
||||||
int &channels)> builtin_image_info_cb;
|
int &channels,
|
||||||
|
bool &free_cache)> builtin_image_info_cb;
|
||||||
function<bool(const string &filename,
|
function<bool(const string &filename,
|
||||||
void *data,
|
void *data,
|
||||||
unsigned char *pixels,
|
unsigned char *pixels,
|
||||||
const size_t pixels_size)> builtin_image_pixels_cb;
|
const size_t pixels_size,
|
||||||
|
const bool free_cache)> builtin_image_pixels_cb;
|
||||||
function<bool(const string &filename,
|
function<bool(const string &filename,
|
||||||
void *data,
|
void *data,
|
||||||
float *pixels,
|
float *pixels,
|
||||||
const size_t pixels_size)> builtin_image_float_pixels_cb;
|
const size_t pixels_size,
|
||||||
|
const bool free_cache)> builtin_image_float_pixels_cb;
|
||||||
|
|
||||||
struct Image {
|
struct Image {
|
||||||
string filename;
|
string filename;
|
||||||
void *builtin_data;
|
void *builtin_data;
|
||||||
|
bool builtin_free_cache;
|
||||||
|
|
||||||
bool use_alpha;
|
bool use_alpha;
|
||||||
bool need_load;
|
bool need_load;
|
||||||
@ -125,7 +132,12 @@ private:
|
|||||||
void *osl_texture_system;
|
void *osl_texture_system;
|
||||||
bool pack_images;
|
bool pack_images;
|
||||||
|
|
||||||
bool file_load_image_generic(Image *img, ImageInput **in, int &width, int &height, int &depth, int &components);
|
bool file_load_image_generic(Image *img,
|
||||||
|
ImageInput **in,
|
||||||
|
int &width,
|
||||||
|
int &height,
|
||||||
|
int &depth,
|
||||||
|
int &components);
|
||||||
|
|
||||||
template<TypeDesc::BASETYPE FileFormat,
|
template<TypeDesc::BASETYPE FileFormat,
|
||||||
typename StorageType,
|
typename StorageType,
|
||||||
|
@ -365,7 +365,8 @@ void ImageTextureNode::compile(OSLCompiler& compiler)
|
|||||||
if(is_float == -1) {
|
if(is_float == -1) {
|
||||||
if(builtin_data == NULL) {
|
if(builtin_data == NULL) {
|
||||||
ImageDataType type;
|
ImageDataType type;
|
||||||
type = image_manager->get_image_metadata(filename.string(), NULL, is_linear);
|
bool builtin_free_cache;
|
||||||
|
type = image_manager->get_image_metadata(filename.string(), NULL, is_linear, builtin_free_cache);
|
||||||
if(type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4)
|
if(type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4)
|
||||||
is_float = 1;
|
is_float = 1;
|
||||||
}
|
}
|
||||||
@ -554,7 +555,8 @@ void EnvironmentTextureNode::compile(OSLCompiler& compiler)
|
|||||||
if(is_float == -1) {
|
if(is_float == -1) {
|
||||||
if(builtin_data == NULL) {
|
if(builtin_data == NULL) {
|
||||||
ImageDataType type;
|
ImageDataType type;
|
||||||
type = image_manager->get_image_metadata(filename.string(), NULL, is_linear);
|
bool builtin_free_cache;
|
||||||
|
type = image_manager->get_image_metadata(filename.string(), NULL, is_linear, builtin_free_cache);
|
||||||
if(type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4)
|
if(type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4)
|
||||||
is_float = 1;
|
is_float = 1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user