archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
549248f64beaa9f8ffe9ff2e55939ac4f0c23259
blender-archive/source/blender/render/intern/source/external_engine.c

563 lines
13 KiB
C
Raw Normal View History

code cleanup: header cleanup
2012-04-30 14:24:11 +00:00
/*
Fix threading issues of viewport rendering when using movies/generated images Issue was caused by the fact that guarded allocator is not thread-safe and generated images/movies could allocate memory when loading pixels to Cycles. Currently solved by switching memory allocator to using mutex lock (the same as sued for jobs) when viewport rendering is used. Nicer solution would be to make guarded allocator thread-safe by using atomic operations and lock-free lists, but that's more serious change.
2013-01-24 08:14:20 +00:00
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2006 Blender Foundation.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): none yet.
*
* ***** END GPL LICENSE BLOCK *****
*/
misc doc edits - remove recently added sphinx reference workaround. - tested doxygen, correct some warnings, set tab width and added pymathutils group. - added convenience target 'make doc_doxy'
2011-11-05 01:48:10 +00:00
/** \file blender/render/intern/source/external_engine.c
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
* \ingroup render
*/
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include "MEM_guardedalloc.h"
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
#include "BLF_translation.h"
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "BLI_utildefines.h"
Fix #30512: external render saved render result after reporting error.
2012-03-12 11:32:23 +00:00
#include "BKE_global.h"
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
#include "BKE_report.h"
#include "BKE_scene.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
Fix #36327: cycles render layers exclude layers animation did not work well. This is kind of another way to animate layers which is disabled, but add an exception to make this case work.
2013-09-10 20:26:34 +00:00
#include "RNA_access.h"
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
#ifdef WITH_PYTHON
#include "BPY_extern.h"
#endif
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
#include "RE_engine.h"
#include "RE_pipeline.h"
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
#include "initrender.h"
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
#include "render_types.h"
Code refactoring: split render result related functions into separate file.
2012-01-05 17:50:09 +00:00
#include "render_result.h"
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
/* Render Engine Types */
static RenderEngineType internal_render_type = {
NULL, NULL,
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
"BLENDER_RENDER", N_("Blender Render"), RE_INTERNAL,
Render API: shader script node for custom shaders. * Shader script node added, which stores either a link to a text datablock or file on disk, and has functions to add and remove sockets. * Callback RenderEngine.update_script_node(self, node) added for render engines to compile the shader and update the node with new sockets. Thanks to Thomas, Lukas and Dalai for the implementation.
2012-11-03 14:32:26 +00:00
NULL, NULL, NULL, NULL, NULL,
style cleanup
2012-06-16 16:57:16 +00:00
{NULL, NULL, NULL}
};
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
#ifdef WITH_GAMEENGINE
static RenderEngineType internal_game_type = {
NULL, NULL,
style cleanup
2012-06-16 16:57:16 +00:00
"BLENDER_GAME", N_("Blender Game"), RE_INTERNAL | RE_GAME,
Render API: shader script node for custom shaders. * Shader script node added, which stores either a link to a text datablock or file on disk, and has functions to add and remove sockets. * Callback RenderEngine.update_script_node(self, node) added for render engines to compile the shader and update the node with new sockets. Thanks to Thomas, Lukas and Dalai for the implementation.
2012-11-03 14:32:26 +00:00
NULL, NULL, NULL, NULL, NULL,
style cleanup
2012-06-16 16:57:16 +00:00
{NULL, NULL, NULL}
};
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
#endif
ListBase R_engines = {NULL, NULL};
void RE_engines_init(void)
{
BLI_addtail(&R_engines, &internal_render_type);
#ifdef WITH_GAMEENGINE
BLI_addtail(&R_engines, &internal_game_type);
#endif
}
void RE_engines_exit(void)
{
RenderEngineType *type, *next;
style cleanup
2012-06-16 16:57:16 +00:00
for (type = R_engines.first; type; type = next) {
next = type->next;
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
BLI_remlink(&R_engines, type);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!(type->flag & RE_INTERNAL)) {
if (type->ext.free)
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
type->ext.free(type->ext.data);
MEM_freeN(type);
}
}
}
RenderEngineType *RE_engines_find(const char *idname)
{
RenderEngineType *type;
style cleanup
2012-06-16 16:57:16 +00:00
type = BLI_findstring(&R_engines, idname, offsetof(RenderEngineType, idname));
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!type)
style cleanup
2012-06-16 16:57:16 +00:00
type = &internal_render_type;
Blender Internal Render in viewport Because of our release soon, feature has been added behind the Debug Menu. CTRL+ALT+D and set it to -1. Or commandline --debug-value -1. When debug set to -1, you can put the viewport to 'render' mode, just like for Cycles. Notes for testers: (and please no bugs in tracker for this :) - It renders without AA, MBlur, Panorama, Sequence, Composite - Only active render layer gets rendered. Select another layer will re-render. - But yes: it works for FreeStyle renders! - Also does great for local view. - BI is not well suited for incremental renders on view changes. This only works for non-raytrace scenes, or zoom in ortho or camera mode, or for Material changes. In most cases a full re-render is being done. - ESC works to stop the preview render. - Borders render as well. (CTRL+B) - Force a refresh with arrow key left/right. A lot of settings don't trigger re-render yet. Tech notes: - FreeStyle is adding a lot of temp objects/meshes in the Main database. This caused DepsGraph to trigger changes (and redraws). I've prepended the names for these temp objects with char number 27 (ESC), and made these names be ignored for tag update checking. - Fixed some bugs that were noticable with such excessive re-renders, like for opening file window, quit during renders.
2013-04-16 17:39:20 +00:00
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
return type;
}
Fix #29406: show Sequence as render layer when rendering from sequencer, to make it more clear what was rendered. Fix #29407: external engine api doesn't support full sample yet, would give too dark render result.
2011-11-26 18:33:31 +00:00
int RE_engine_is_external(Render *re)
{
style cleanup
2012-06-16 16:57:16 +00:00
RenderEngineType *type = RE_engines_find(re->r.engine);
Fix #29406: show Sequence as render layer when rendering from sequencer, to make it more clear what was rendered. Fix #29407: external engine api doesn't support full sample yet, would give too dark render result.
2011-11-26 18:33:31 +00:00
return (type && type->render);
}
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
/* Create, Free */
RenderEngine *RE_engine_create(RenderEngineType *type)
Fix threading issues of viewport rendering when using movies/generated images Issue was caused by the fact that guarded allocator is not thread-safe and generated images/movies could allocate memory when loading pixels to Cycles. Currently solved by switching memory allocator to using mutex lock (the same as sued for jobs) when viewport rendering is used. Nicer solution would be to make guarded allocator thread-safe by using atomic operations and lock-free lists, but that's more serious change.
2013-01-24 08:14:20 +00:00
{
return RE_engine_create_ex(type, FALSE);
}
code cleanup: use bool where values are true/false, for view3d and related functions.
2013-03-20 23:14:18 +00:00
RenderEngine *RE_engine_create_ex(RenderEngineType *type, bool use_for_viewport)
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
{
RenderEngine *engine = MEM_callocN(sizeof(RenderEngine), "RenderEngine");
style cleanup
2012-06-16 16:57:16 +00:00
engine->type = type;
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
Fix threading issues of viewport rendering when using movies/generated images Issue was caused by the fact that guarded allocator is not thread-safe and generated images/movies could allocate memory when loading pixels to Cycles. Currently solved by switching memory allocator to using mutex lock (the same as sued for jobs) when viewport rendering is used. Nicer solution would be to make guarded allocator thread-safe by using atomic operations and lock-free lists, but that's more serious change.
2013-01-24 08:14:20 +00:00
if (use_for_viewport) {
engine->flag |= RE_ENGINE_USED_FOR_VIEWPORT;
BLI_begin_threaded_malloc();
}
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
return engine;
}
void RE_engine_free(RenderEngine *engine)
{
RenderEngine: steps towards implementation of this proposal: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI * RenderEngine is now a persistent python object that exists and retains properties as long as a frame is being rendered. This is mostly useful now that more than one callback will be added. * Added update() callback that should ideally be used to export the scene, leaving only the rendering to the render() callback. This is not required to be used at this point, but separating this will make things more thread safe later on. * Added tag_redraw() and tag_update() functions that will be used for viewport rendering. * Internal change: status text is now retained after update_status calls.
2011-11-02 14:33:14 +00:00
#ifdef WITH_PYTHON
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (engine->py_instance) {
fix [#31661] Custom properties do no respect min/max values also renamed function added prev commit
2012-10-26 10:54:02 +00:00
BPY_DECREF_RNA_INVALIDATE(engine->py_instance);
RenderEngine: steps towards implementation of this proposal: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI * RenderEngine is now a persistent python object that exists and retains properties as long as a frame is being rendered. This is mostly useful now that more than one callback will be added. * Added update() callback that should ideally be used to export the scene, leaving only the rendering to the render() callback. This is not required to be used at this point, but separating this will make things more thread safe later on. * Added tag_redraw() and tag_update() functions that will be used for viewport rendering. * Internal change: status text is now retained after update_status calls.
2011-11-02 14:33:14 +00:00
}
#endif
Fix threading issues of viewport rendering when using movies/generated images Issue was caused by the fact that guarded allocator is not thread-safe and generated images/movies could allocate memory when loading pixels to Cycles. Currently solved by switching memory allocator to using mutex lock (the same as sued for jobs) when viewport rendering is used. Nicer solution would be to make guarded allocator thread-safe by using atomic operations and lock-free lists, but that's more serious change.
2013-01-24 08:14:20 +00:00
if (engine->flag & RE_ENGINE_USED_FOR_VIEWPORT) {
BLI_end_threaded_malloc();
}
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
MEM_freeN(engine);
}
/* Render Results */
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Highlight currently rendering tiles This commit implements highlight of tiles which are being currently rendered for both Blender Internal and Cycles (and should be possible to use it for other external engines as well). Couple of implementation details: - Added one extra boolean flag to render engine which should be set to truth if render engine wants to highlight tiles. If so, property use_highlight_tiles should be set to True. - Render Part's ready boolena was changed by status enum, which could be NONE, IN_PROGRESS and READY. All render part with IN_PROGRESS status will be highlighted in image editor. - For external engines render part's status is filling in automatically. Initially all render parts has got NONE status, then one external engine acquire render result, corresponding part will change status to IN_PROGRESS. As soon as render result is finished, corresponding render part will change status to FINISHED This should make it easy to highlight tiles for other engines as well.
2013-01-01 16:15:13 +00:00
static RenderPart *get_part_from_result(Render *re, RenderResult *result)
{
RenderPart *pa;
for (pa = re->parts.first; pa; pa = pa->next) {
if (result->tilerect.xmin == pa->disprect.xmin - re->disprect.xmin &&
result->tilerect.ymin == pa->disprect.ymin - re->disprect.ymin &&
result->tilerect.xmax == pa->disprect.xmax - re->disprect.xmin &&
result->tilerect.ymax == pa->disprect.ymax - re->disprect.ymin)
{
return pa;
}
}
return NULL;
}
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w, int h, const char *layername)
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
{
style cleanup
2012-06-16 16:57:16 +00:00
Render *re = engine->re;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
RenderResult *result;
rcti disprect;
/* ensure the coordinates are within the right limits */
CLAMP(x, 0, re->result->rectx);
CLAMP(y, 0, re->result->recty);
CLAMP(w, 0, re->result->rectx);
CLAMP(h, 0, re->result->recty);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (x + w > re->result->rectx)
style cleanup
2012-06-16 16:57:16 +00:00
w = re->result->rectx - x;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (y + h > re->result->recty)
style cleanup
2012-06-16 16:57:16 +00:00
h = re->result->recty - y;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
/* allocate a render result */
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
disprect.xmin = x;
style cleanup
2012-06-16 16:57:16 +00:00
disprect.xmax = x + w;
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
disprect.ymin = y;
style cleanup
2012-06-16 16:57:16 +00:00
disprect.ymax = y + h;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
result = render_result_new(re, &disprect, 0, RR_USE_MEM, layername);
/* todo: make this thread safe */
fix for rare crash we have with some mango files.
2012-07-06 14:24:41 +00:00
/* can be NULL if we CLAMP the width or height to 0 */
if (result) {
Highlight currently rendering tiles This commit implements highlight of tiles which are being currently rendered for both Blender Internal and Cycles (and should be possible to use it for other external engines as well). Couple of implementation details: - Added one extra boolean flag to render engine which should be set to truth if render engine wants to highlight tiles. If so, property use_highlight_tiles should be set to True. - Render Part's ready boolena was changed by status enum, which could be NONE, IN_PROGRESS and READY. All render part with IN_PROGRESS status will be highlighted in image editor. - For external engines render part's status is filling in automatically. Initially all render parts has got NONE status, then one external engine acquire render result, corresponding part will change status to IN_PROGRESS. As soon as render result is finished, corresponding render part will change status to FINISHED This should make it easy to highlight tiles for other engines as well.
2013-01-01 16:15:13 +00:00
RenderPart *pa;
fix for rare crash we have with some mango files.
2012-07-06 14:24:41 +00:00
BLI_addtail(&engine->fullresult, result);
result->tilerect.xmin += re->disprect.xmin;
result->tilerect.xmax += re->disprect.xmin;
result->tilerect.ymin += re->disprect.ymin;
result->tilerect.ymax += re->disprect.ymin;
Highlight currently rendering tiles This commit implements highlight of tiles which are being currently rendered for both Blender Internal and Cycles (and should be possible to use it for other external engines as well). Couple of implementation details: - Added one extra boolean flag to render engine which should be set to truth if render engine wants to highlight tiles. If so, property use_highlight_tiles should be set to True. - Render Part's ready boolena was changed by status enum, which could be NONE, IN_PROGRESS and READY. All render part with IN_PROGRESS status will be highlighted in image editor. - For external engines render part's status is filling in automatically. Initially all render parts has got NONE status, then one external engine acquire render result, corresponding part will change status to IN_PROGRESS. As soon as render result is finished, corresponding render part will change status to FINISHED This should make it easy to highlight tiles for other engines as well.
2013-01-01 16:15:13 +00:00
pa = get_part_from_result(re, result);
if (pa)
pa->status = PART_STATUS_IN_PROGRESS;
fix for rare crash we have with some mango files.
2012-07-06 14:24:41 +00:00
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return result;
}
void RE_engine_update_result(RenderEngine *engine, RenderResult *result)
{
style cleanup
2012-06-16 16:57:16 +00:00
Render *re = engine->re;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (result) {
style cleanup
2012-07-07 22:51:57 +00:00
result->renlay = result->layers.first; /* weak, draws first layer always */
Changes to partial update during rendering Summary: Mainly addressed to solve old TODO with color managed fallback to CPU mode when displaying render result during rendering. That fallback was caused by the fact that partial image update was always acquiring image buffer for composite output and was only modifying display buffer directly. This was a big issue for Cycles rendering which renders layers one by one and wanted to display progress of each individual layer. This lead to situations when display buffer was based on what Cycles passes via RenderResult and didn't take layer/pass from image editor header into account. Now made it so image buffer which partial update is operating with always corresponds to what is set in image editor header. To make Cycles displaying progress of all the layers one by one made it so image_rect_update switches image editor user to newly rendering render layer. It happens only once when render engine starts rendering next render layer, so should not be annoying for navigation during rendering. Additional change to render engines was done to make it so they're able to merge composite output to final result without marking tile as done. This is done via do_merge_result argument to end_result() callback. This argument is optional so should not break script compatibility. Additional changes: - Partial display update for Blender Internal now happens from the same thread as tile rendering. This makes it so display conversion (which could be pretty heavy actually) is done in separate threads. Also gives better UI feedback when rendering easy scene with small tiles. - Avoid freeing/allocating byte buffer for render result if it's owned by the image buffer. Only mark it as invalid for color management. Saves loads of buffer re-allocations in cases when having several image editors opened with render result. This change in conjunction with the rest of the patch gave around 50%-100% speedup of render time when displaying non-combined pass during rendering on my laptop. - Partial display buffer update was wrong for buffers with number of channels different from 4. - Remove unused window from RenderJob. - Made image_buffer_rect_update static since it's only used in single file. Reviewers: brecht Reviewed By: brecht CC: dingto Differential Revision: http://developer.blender.org/D98
2013-12-17 23:42:38 +06:00
re->display_update(re->duh, result, NULL);
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
}
}
Changes to partial update during rendering Summary: Mainly addressed to solve old TODO with color managed fallback to CPU mode when displaying render result during rendering. That fallback was caused by the fact that partial image update was always acquiring image buffer for composite output and was only modifying display buffer directly. This was a big issue for Cycles rendering which renders layers one by one and wanted to display progress of each individual layer. This lead to situations when display buffer was based on what Cycles passes via RenderResult and didn't take layer/pass from image editor header into account. Now made it so image buffer which partial update is operating with always corresponds to what is set in image editor header. To make Cycles displaying progress of all the layers one by one made it so image_rect_update switches image editor user to newly rendering render layer. It happens only once when render engine starts rendering next render layer, so should not be annoying for navigation during rendering. Additional change to render engines was done to make it so they're able to merge composite output to final result without marking tile as done. This is done via do_merge_result argument to end_result() callback. This argument is optional so should not break script compatibility. Additional changes: - Partial display update for Blender Internal now happens from the same thread as tile rendering. This makes it so display conversion (which could be pretty heavy actually) is done in separate threads. Also gives better UI feedback when rendering easy scene with small tiles. - Avoid freeing/allocating byte buffer for render result if it's owned by the image buffer. Only mark it as invalid for color management. Saves loads of buffer re-allocations in cases when having several image editors opened with render result. This change in conjunction with the rest of the patch gave around 50%-100% speedup of render time when displaying non-combined pass during rendering on my laptop. - Partial display buffer update was wrong for buffers with number of channels different from 4. - Remove unused window from RenderJob. - Made image_buffer_rect_update static since it's only used in single file. Reviewers: brecht Reviewed By: brecht CC: dingto Differential Revision: http://developer.blender.org/D98
2013-12-17 23:42:38 +06:00
void RE_engine_end_result(RenderEngine *engine, RenderResult *result, int cancel, int merge_results)
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
{
style cleanup
2012-06-16 16:57:16 +00:00
Render *re = engine->re;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
fix for some errors reported by http://clang.blenderheads.org/trunk/ in r50384. - when renderlayers could not be found in save_render_result_tile() blender would crash. - RE_engine_end_result() / rna end_result() didn't set result argument as required. ... also some style cleanup.
2012-09-04 18:27:47 +00:00
if (!result) {
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return;
fix for some errors reported by http://clang.blenderheads.org/trunk/ in r50384. - when renderlayers could not be found in save_render_result_tile() blender would crash. - RE_engine_end_result() / rna end_result() didn't set result argument as required. ... also some style cleanup.
2012-09-04 18:27:47 +00:00
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
/* merge. on break, don't merge in result for preview renders, looks nicer */
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
if (!cancel) {
/* for exr tile render, detect tiles that are done */
Highlight currently rendering tiles This commit implements highlight of tiles which are being currently rendered for both Blender Internal and Cycles (and should be possible to use it for other external engines as well). Couple of implementation details: - Added one extra boolean flag to render engine which should be set to truth if render engine wants to highlight tiles. If so, property use_highlight_tiles should be set to True. - Render Part's ready boolena was changed by status enum, which could be NONE, IN_PROGRESS and READY. All render part with IN_PROGRESS status will be highlighted in image editor. - For external engines render part's status is filling in automatically. Initially all render parts has got NONE status, then one external engine acquire render result, corresponding part will change status to IN_PROGRESS. As soon as render result is finished, corresponding render part will change status to FINISHED This should make it easy to highlight tiles for other engines as well.
2013-01-01 16:15:13 +00:00
RenderPart *pa = get_part_from_result(re, result);
Fix #36091: external render engines like Luxrender don't work well with the save buffers option, it requires specific tile sizes and if they don't match what OpenEXR expects file saving can get stuck. Now I've made support for his optional, with a bl_use_save_buffers property for RenderEngine, set to False by default.
2013-07-11 12:22:29 +00:00
if (pa) {
Highlight currently rendering tiles This commit implements highlight of tiles which are being currently rendered for both Blender Internal and Cycles (and should be possible to use it for other external engines as well). Couple of implementation details: - Added one extra boolean flag to render engine which should be set to truth if render engine wants to highlight tiles. If so, property use_highlight_tiles should be set to True. - Render Part's ready boolena was changed by status enum, which could be NONE, IN_PROGRESS and READY. All render part with IN_PROGRESS status will be highlighted in image editor. - For external engines render part's status is filling in automatically. Initially all render parts has got NONE status, then one external engine acquire render result, corresponding part will change status to IN_PROGRESS. As soon as render result is finished, corresponding render part will change status to FINISHED This should make it easy to highlight tiles for other engines as well.
2013-01-01 16:15:13 +00:00
pa->status = PART_STATUS_READY;
Fix #36091: external render engines like Luxrender don't work well with the save buffers option, it requires specific tile sizes and if they don't match what OpenEXR expects file saving can get stuck. Now I've made support for his optional, with a bl_use_save_buffers property for RenderEngine, set to False by default.
2013-07-11 12:22:29 +00:00
}
else if (re->result->do_exr_tile) {
/* if written result does not match any tile and we are using save
* buffers, we are going to get openexr save errors */
fprintf(stderr, "RenderEngine.end_result: dimensions do not match any OpenEXR tile.\n");
}
Changes to partial update during rendering Summary: Mainly addressed to solve old TODO with color managed fallback to CPU mode when displaying render result during rendering. That fallback was caused by the fact that partial image update was always acquiring image buffer for composite output and was only modifying display buffer directly. This was a big issue for Cycles rendering which renders layers one by one and wanted to display progress of each individual layer. This lead to situations when display buffer was based on what Cycles passes via RenderResult and didn't take layer/pass from image editor header into account. Now made it so image buffer which partial update is operating with always corresponds to what is set in image editor header. To make Cycles displaying progress of all the layers one by one made it so image_rect_update switches image editor user to newly rendering render layer. It happens only once when render engine starts rendering next render layer, so should not be annoying for navigation during rendering. Additional change to render engines was done to make it so they're able to merge composite output to final result without marking tile as done. This is done via do_merge_result argument to end_result() callback. This argument is optional so should not break script compatibility. Additional changes: - Partial display update for Blender Internal now happens from the same thread as tile rendering. This makes it so display conversion (which could be pretty heavy actually) is done in separate threads. Also gives better UI feedback when rendering easy scene with small tiles. - Avoid freeing/allocating byte buffer for render result if it's owned by the image buffer. Only mark it as invalid for color management. Saves loads of buffer re-allocations in cases when having several image editors opened with render result. This change in conjunction with the rest of the patch gave around 50%-100% speedup of render time when displaying non-combined pass during rendering on my laptop. - Partial display buffer update was wrong for buffers with number of channels different from 4. - Remove unused window from RenderJob. - Made image_buffer_rect_update static since it's only used in single file. Reviewers: brecht Reviewed By: brecht CC: dingto Differential Revision: http://developer.blender.org/D98
2013-12-17 23:42:38 +06:00
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Changes to partial update during rendering Summary: Mainly addressed to solve old TODO with color managed fallback to CPU mode when displaying render result during rendering. That fallback was caused by the fact that partial image update was always acquiring image buffer for composite output and was only modifying display buffer directly. This was a big issue for Cycles rendering which renders layers one by one and wanted to display progress of each individual layer. This lead to situations when display buffer was based on what Cycles passes via RenderResult and didn't take layer/pass from image editor header into account. Now made it so image buffer which partial update is operating with always corresponds to what is set in image editor header. To make Cycles displaying progress of all the layers one by one made it so image_rect_update switches image editor user to newly rendering render layer. It happens only once when render engine starts rendering next render layer, so should not be annoying for navigation during rendering. Additional change to render engines was done to make it so they're able to merge composite output to final result without marking tile as done. This is done via do_merge_result argument to end_result() callback. This argument is optional so should not break script compatibility. Additional changes: - Partial display update for Blender Internal now happens from the same thread as tile rendering. This makes it so display conversion (which could be pretty heavy actually) is done in separate threads. Also gives better UI feedback when rendering easy scene with small tiles. - Avoid freeing/allocating byte buffer for render result if it's owned by the image buffer. Only mark it as invalid for color management. Saves loads of buffer re-allocations in cases when having several image editors opened with render result. This change in conjunction with the rest of the patch gave around 50%-100% speedup of render time when displaying non-combined pass during rendering on my laptop. - Partial display buffer update was wrong for buffers with number of channels different from 4. - Remove unused window from RenderJob. - Made image_buffer_rect_update static since it's only used in single file. Reviewers: brecht Reviewed By: brecht CC: dingto Differential Revision: http://developer.blender.org/D98
2013-12-17 23:42:38 +06:00
if (!cancel || merge_results) {
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
if (re->result->do_exr_tile)
render_result_exr_file_merge(re->result, result);
Fixes for blender internal viewport render: * Particles did not render at viewport resolution like meshes. * Properties editor preview render of hair was crashing, solution is to have two separate flags for this preview render and viewport preview render.
2013-05-15 17:09:45 +00:00
else if (!(re->test_break(re->tbh) && (re->r.scemode & R_BUTS_PREVIEW)))
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
render_result_merge(re->result, result);
/* draw */
if (!re->test_break(re->tbh)) {
result->renlay = result->layers.first; /* weak, draws first layer always */
Changes to partial update during rendering Summary: Mainly addressed to solve old TODO with color managed fallback to CPU mode when displaying render result during rendering. That fallback was caused by the fact that partial image update was always acquiring image buffer for composite output and was only modifying display buffer directly. This was a big issue for Cycles rendering which renders layers one by one and wanted to display progress of each individual layer. This lead to situations when display buffer was based on what Cycles passes via RenderResult and didn't take layer/pass from image editor header into account. Now made it so image buffer which partial update is operating with always corresponds to what is set in image editor header. To make Cycles displaying progress of all the layers one by one made it so image_rect_update switches image editor user to newly rendering render layer. It happens only once when render engine starts rendering next render layer, so should not be annoying for navigation during rendering. Additional change to render engines was done to make it so they're able to merge composite output to final result without marking tile as done. This is done via do_merge_result argument to end_result() callback. This argument is optional so should not break script compatibility. Additional changes: - Partial display update for Blender Internal now happens from the same thread as tile rendering. This makes it so display conversion (which could be pretty heavy actually) is done in separate threads. Also gives better UI feedback when rendering easy scene with small tiles. - Avoid freeing/allocating byte buffer for render result if it's owned by the image buffer. Only mark it as invalid for color management. Saves loads of buffer re-allocations in cases when having several image editors opened with render result. This change in conjunction with the rest of the patch gave around 50%-100% speedup of render time when displaying non-combined pass during rendering on my laptop. - Partial display buffer update was wrong for buffers with number of channels different from 4. - Remove unused window from RenderJob. - Made image_buffer_rect_update static since it's only used in single file. Reviewers: brecht Reviewed By: brecht CC: dingto Differential Revision: http://developer.blender.org/D98
2013-12-17 23:42:38 +06:00
re->display_update(re->duh, result, NULL);
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
}
/* free */
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
BLI_remlink(&engine->fullresult, result);
render_result_free(result);
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
}
/* Cancel */
int RE_engine_test_break(RenderEngine *engine)
{
style cleanup
2012-06-16 16:57:16 +00:00
Render *re = engine->re;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (re)
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return re->test_break(re->tbh);
return 0;
}
/* Statistics */
void RE_engine_update_stats(RenderEngine *engine, const char *stats, const char *info)
{
style cleanup
2012-06-16 16:57:16 +00:00
Render *re = engine->re;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
/* stats draw callback */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (re) {
style cleanup
2012-06-16 16:57:16 +00:00
re->i.statstr = stats;
re->i.infostr = info;
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
re->stats_draw(re->sdh, &re->i);
style cleanup
2012-06-16 16:57:16 +00:00
re->i.infostr = NULL;
re->i.statstr = NULL;
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
}
RenderEngine: steps towards implementation of this proposal: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI * RenderEngine is now a persistent python object that exists and retains properties as long as a frame is being rendered. This is mostly useful now that more than one callback will be added. * Added update() callback that should ideally be used to export the scene, leaving only the rendering to the render() callback. This is not required to be used at this point, but separating this will make things more thread safe later on. * Added tag_redraw() and tag_update() functions that will be used for viewport rendering. * Internal change: status text is now retained after update_status calls.
2011-11-02 14:33:14 +00:00
/* set engine text */
Fix #35470: crash rendering from the terminal in some cases due to render info text threading issue.
2013-07-12 20:31:30 +00:00
engine->text[0] = '\0';
RenderEngine: steps towards implementation of this proposal: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI * RenderEngine is now a persistent python object that exists and retains properties as long as a frame is being rendered. This is mostly useful now that more than one callback will be added. * Added update() callback that should ideally be used to export the scene, leaving only the rendering to the render() callback. This is not required to be used at this point, but separating this will make things more thread safe later on. * Added tag_redraw() and tag_update() functions that will be used for viewport rendering. * Internal change: status text is now retained after update_status calls.
2011-11-02 14:33:14 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (stats && stats[0] && info && info[0])
Fix #35470: crash rendering from the terminal in some cases due to render info text threading issue.
2013-07-12 20:31:30 +00:00
BLI_snprintf(engine->text, sizeof(engine->text), "%s | %s", stats, info);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
else if (info && info[0])
Fix #35470: crash rendering from the terminal in some cases due to render info text threading issue.
2013-07-12 20:31:30 +00:00
BLI_strncpy(engine->text, info, sizeof(engine->text));
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
else if (stats && stats[0])
fix for incorrect null check in RE_engine_update_stats
2013-07-26 10:11:18 +00:00
BLI_strncpy(engine->text, stats, sizeof(engine->text));
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
}
void RE_engine_update_progress(RenderEngine *engine, float progress)
{
style cleanup
2012-06-16 16:57:16 +00:00
Render *re = engine->re;
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (re) {
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
CLAMP(progress, 0.0f, 1.0f);
re->progress(re->prh, progress);
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
}
Cycles: memory usage report This commit adds memory usage information while rendering. It reports memory used by device, meaning: - For CPU it'll report real memory consumption - For GPU rendering it'll report GPU memory consumption, but it'll also mean the same memory is used from host side. This information displays information about memory requested by Cycles, not memory really allocated on a device. Real memory usage might be higher because of memory fragmentation or optimistic memory allocator. There's really nothing we can do against this. Also in contrast with blender internal's render cycles memory usage does not include memory used by scene, only memory needed by cycles itself will be displayed. So don't freak out if memory usage reported by cycles would be much lower than blender internal's. This commit also adds RenderEngine.update_memory_stats callback which is used to tell memory consumption from external engine to blender. This information is used to generate information line after rendering is finished.
2012-11-05 08:04:57 +00:00
void RE_engine_update_memory_stats(RenderEngine *engine, float mem_used, float mem_peak)
{
Render *re = engine->re;
if (re) {
re->i.mem_used = mem_used;
re->i.mem_peak = mem_peak;
}
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
void RE_engine_report(RenderEngine *engine, int type, const char *msg)
{
Render API: shader script node for custom shaders. * Shader script node added, which stores either a link to a text datablock or file on disk, and has functions to add and remove sockets. * Callback RenderEngine.update_script_node(self, node) added for render engines to compile the shader and update the node with new sockets. Thanks to Thomas, Lukas and Dalai for the implementation.
2012-11-03 14:32:26 +00:00
Render *re = engine->re;
if (re)
BKE_report(engine->re->reports, type, msg);
style cleanup, also remove redundant call to set_listbasepointers in free_main().
2012-11-07 01:02:28 +00:00
else if (engine->reports)
Render API: shader script node for custom shaders. * Shader script node added, which stores either a link to a text datablock or file on disk, and has functions to add and remove sockets. * Callback RenderEngine.update_script_node(self, node) added for render engines to compile the shader and update the node with new sockets. Thanks to Thomas, Lukas and Dalai for the implementation.
2012-11-03 14:32:26 +00:00
BKE_report(engine->reports, type, msg);
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
}
Highlight currently rendering tiles This commit implements highlight of tiles which are being currently rendered for both Blender Internal and Cycles (and should be possible to use it for other external engines as well). Couple of implementation details: - Added one extra boolean flag to render engine which should be set to truth if render engine wants to highlight tiles. If so, property use_highlight_tiles should be set to True. - Render Part's ready boolena was changed by status enum, which could be NONE, IN_PROGRESS and READY. All render part with IN_PROGRESS status will be highlighted in image editor. - For external engines render part's status is filling in automatically. Initially all render parts has got NONE status, then one external engine acquire render result, corresponding part will change status to IN_PROGRESS. As soon as render result is finished, corresponding render part will change status to FINISHED This should make it easy to highlight tiles for other engines as well.
2013-01-01 16:15:13 +00:00
void RE_engine_get_current_tiles(Render *re, int *total_tiles_r, rcti **tiles_r)
{
RenderPart *pa;
int total_tiles = 0;
rcti *tiles = NULL;
int allocation_size = 0, allocation_step = BLENDER_MAX_THREADS;
if (re->engine && (re->engine->flag & RE_ENGINE_HIGHLIGHT_TILES) == 0) {
*total_tiles_r = 0;
*tiles_r = NULL;
return;
}
for (pa = re->parts.first; pa; pa = pa->next) {
if (pa->status == PART_STATUS_IN_PROGRESS) {
if (total_tiles >= allocation_size) {
if (tiles == NULL)
tiles = MEM_mallocN(allocation_step * sizeof(rcti), "current engine tiles");
else
tiles = MEM_reallocN(tiles, (total_tiles + allocation_step) * sizeof(rcti));
allocation_size += allocation_step;
}
tiles[total_tiles] = pa->disprect;
if (pa->crop) {
tiles[total_tiles].xmin += pa->crop;
tiles[total_tiles].ymin += pa->crop;
tiles[total_tiles].xmax -= pa->crop;
tiles[total_tiles].ymax -= pa->crop;
}
total_tiles++;
}
}
*total_tiles_r = total_tiles;
*tiles_r = tiles;
}
Border rendering now works for all scenes used in compositor, before this only active scene would be rendered with border. When do_render_fields_blur_3d() is finished, it'll modify render's display rect so it'll correspond bordered render result placed on black backgrund. Actual border is stored nowhere, which makes it only way to re-calculate disprect for all other renders used in compo based on source. Not so big deal actually. Also needed to modify Cycles a bit, because before this patch it used border settings from scene being rendered. Now made it so render data is passing to external engines. Using a property inside RenderEngine structure for this. Not best ever design for passing render data, but this would prevent API breakage. So now external engines could access engine.render to access active rendering settings. Reviewed by Brecht, thanks!
2013-03-14 07:38:37 +00:00
RenderData *RE_engine_get_render_data(Render *re)
{
return &re->r;
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
/* Render */
Fix #36327: cycles render layers exclude layers animation did not work well. This is kind of another way to animate layers which is disabled, but add an exception to make this case work.
2013-09-10 20:26:34 +00:00
static bool render_layer_exclude_animated(Scene *scene, SceneRenderLayer *srl)
{
PointerRNA ptr;
PropertyRNA *prop;
RNA_pointer_create(&scene->id, &RNA_SceneRenderLayer, srl, &ptr);
prop = RNA_struct_find_property(&ptr, "layers_exclude");
return RNA_property_animated(&ptr, prop);
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
int RE_engine_render(Render *re, int do_all)
{
style cleanup
2012-06-16 16:57:16 +00:00
RenderEngineType *type = RE_engines_find(re->r.engine);
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
RenderEngine *engine;
Render Engines: fix crash when changing render engine during rendering Crash would have been happen when changing render ending at the same time rendering happens. It could be final Cycles render or even preview LUX render.
2012-11-13 11:00:46 +00:00
int persistent_data = re->r.mode & R_PERSISTENT_DATA;
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
/* verify if we can render */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!type->render)
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return 0;
Fixes for blender internal viewport render: * Particles did not render at viewport resolution like meshes. * Properties editor preview render of hair was crashing, solution is to have two separate flags for this preview render and viewport preview render.
2013-05-15 17:09:45 +00:00
if ((re->r.scemode & R_BUTS_PREVIEW) && !(type->flag & RE_USE_PREVIEW))
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return 0;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (do_all && !(type->flag & RE_USE_POSTPROCESS))
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return 0;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!do_all && (type->flag & RE_USE_POSTPROCESS))
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return 0;
Fix T36474: Blender 2.68a crashes upon rendering Summary: Original issue was caused by wring detection of whether SS modifier is being applied for render/viewport. After recent dependency graph commit this was no longer an issue. But it still might have happen conflict between viewport draw and scene_update_for_newframe() invoked from render thread when using external engines like Cycles. Solved by adding viewport lock while scene is being updated and objects being exported to the render engine. Same lock was already used for Blender Internal. Reviewers: brecht Reviewed By: brecht Maniphest Tasks: T36474 Differential Revision: https://developer.blender.org/D138
2013-12-27 18:52:41 +06:00
/* Lock drawing in UI during data phase. */
if (re->draw_lock) {
re->draw_lock(re->dlh, 1);
}
Fix #35384: animation to enable/disable render layers was applied one frame too late when rendering animations.
2013-05-16 12:03:21 +00:00
/* update animation here so any render layer animation is applied before
* creating the render result */
Fix #35681: cycles excluded layers still got evaluated before and after rendering even if they were not used on any render layers.
2013-06-10 13:53:38 +00:00
if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_BUTS_PREVIEW)) == 0) {
unsigned int lay = re->lay;
/* don't update layers excluded on all render layers */
if (type->flag & RE_USE_EXCLUDE_LAYERS) {
SceneRenderLayer *srl;
unsigned int non_excluded_lay = 0;
if (re->r.scemode & R_SINGLE_LAYER) {
srl = BLI_findlink(&re->r.layers, re->r.actlay);
Fix #36327: cycles render layers exclude layers animation did not work well. This is kind of another way to animate layers which is disabled, but add an exception to make this case work.
2013-09-10 20:26:34 +00:00
if (srl) {
Fix #35681: cycles excluded layers still got evaluated before and after rendering even if they were not used on any render layers.
2013-06-10 13:53:38 +00:00
non_excluded_lay |= ~srl->lay_exclude;
Fix #36327: cycles render layers exclude layers animation did not work well. This is kind of another way to animate layers which is disabled, but add an exception to make this case work.
2013-09-10 20:26:34 +00:00
/* in this case we must update all because animation for
* the scene has not been updated yet, and so may not be
* up to date until after BKE_scene_update_for_newframe */
if (render_layer_exclude_animated(re->scene, srl))
non_excluded_lay |= ~0;
}
Fix #35681: cycles excluded layers still got evaluated before and after rendering even if they were not used on any render layers.
2013-06-10 13:53:38 +00:00
}
else {
Fix #36327: cycles render layers exclude layers animation did not work well. This is kind of another way to animate layers which is disabled, but add an exception to make this case work.
2013-09-10 20:26:34 +00:00
for (srl = re->r.layers.first; srl; srl = srl->next) {
if (!(srl->layflag & SCE_LAY_DISABLE)) {
Fix #35681: cycles excluded layers still got evaluated before and after rendering even if they were not used on any render layers.
2013-06-10 13:53:38 +00:00
non_excluded_lay |= ~srl->lay_exclude;
Fix #36327: cycles render layers exclude layers animation did not work well. This is kind of another way to animate layers which is disabled, but add an exception to make this case work.
2013-09-10 20:26:34 +00:00
if (render_layer_exclude_animated(re->scene, srl))
non_excluded_lay |= ~0;
}
}
Fix #35681: cycles excluded layers still got evaluated before and after rendering even if they were not used on any render layers.
2013-06-10 13:53:38 +00:00
}
lay &= non_excluded_lay;
}
Threaded object update and EvaluationContext Summary: Made objects update happening from multiple threads. It is a task-based scheduling system which uses current dependency graph for spawning new tasks. This means threading happens on object level, but the system is flexible enough for higher granularity. Technical details: - Uses task scheduler which was recently committed to trunk (that one which Brecht ported from Cycles). - Added two utility functions to dependency graph: * DAG_threaded_update_begin, which is called to initialize threaded objects update. It will also schedule root DAG node to the queue, hence starting evaluation process. Initialization will calculate how much parents are to be evaluation before current DAG node can be scheduled. This value is used by task threads for faster detecting which nodes might be scheduled. * DAG_threaded_update_handle_node_updated which is called from task thread function when node was fully handled. This function decreases num_pending_parents of node children and schedules children with zero valency. As it might have become clear, task thread receives DAG nodes and decides which callback to call for it. Currently only BKE_object_handle_update is called for object nodes. In the future it'll call node->callback() from Ali's new DAG. - This required adding some workarounds to the render pipeline. Mainly to stop using get_object_dm() from modifiers' apply callback. Such a call was only a workaround for dependency graph glitch when rendering scene with, say, boolean modifiers before displaying this scene. Such change moves workaround from one place to another, so overall hackentropy remains the same. - Added paradigm of EvaluaitonContext. Currently it's more like just a more reliable replacement for G.is_rendering which fails in some circumstances. Future idea of this context is to also store all the local data needed for objects evaluation such as local time, Copy-on-Write data and so. There're two types of EvaluationContext: * Context used for viewport updated and owned by Main. In the future this context might be easily moved to Window or Screen to allo per-window/per-screen local time. * Context used by render engines to evaluate objects for render purposes. Render engine is an owner of this context. This context is passed to all object update routines. Reviewers: brecht, campbellbarton Reviewed By: brecht CC: lukastoenne Differential Revision: https://developer.blender.org/D94
2013-12-26 17:24:42 +06:00
BKE_scene_update_for_newframe(re->eval_ctx, re->main, re->scene, lay);
Fix #35681: cycles excluded layers still got evaluated before and after rendering even if they were not used on any render layers.
2013-06-10 13:53:38 +00:00
}
Fix #35384: animation to enable/disable render layers was applied one frame too late when rendering animations.
2013-05-16 12:03:21 +00:00
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
/* create render result */
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
Fixes for blender internal viewport render: * Particles did not render at viewport resolution like meshes. * Properties editor preview render of hair was crashing, solution is to have two separate flags for this preview render and viewport preview render.
2013-05-15 17:09:45 +00:00
if (re->result == NULL || !(re->r.scemode & R_BUTS_PREVIEW)) {
Fix #36091: external render engines like Luxrender don't work well with the save buffers option, it requires specific tile sizes and if they don't match what OpenEXR expects file saving can get stuck. Now I've made support for his optional, with a bl_use_save_buffers property for RenderEngine, set to False by default.
2013-07-11 12:22:29 +00:00
int savebuffers = RR_USE_MEM;
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (re->result)
Code refactoring: split render result related functions into separate file.
2012-01-05 17:50:09 +00:00
render_result_free(re->result);
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
Fix #36091: external render engines like Luxrender don't work well with the save buffers option, it requires specific tile sizes and if they don't match what OpenEXR expects file saving can get stuck. Now I've made support for his optional, with a bl_use_save_buffers property for RenderEngine, set to False by default.
2013-07-11 12:22:29 +00:00
if ((type->flag & RE_USE_SAVE_BUFFERS) && (re->r.scemode & R_EXR_TILE_FILE))
savebuffers = RR_USE_EXR;
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
re->result = render_result_new(re, &re->disprect, 0, savebuffers, RR_ALL_LAYERS);
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
}
BLI_rw_mutex_unlock(&re->resultmutex);
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
Fix T36474: Blender 2.68a crashes upon rendering Summary: Original issue was caused by wring detection of whether SS modifier is being applied for render/viewport. After recent dependency graph commit this was no longer an issue. But it still might have happen conflict between viewport draw and scene_update_for_newframe() invoked from render thread when using external engines like Cycles. Solved by adding viewport lock while scene is being updated and objects being exported to the render engine. Same lock was already used for Blender Internal. Reviewers: brecht Reviewed By: brecht Maniphest Tasks: T36474 Differential Revision: https://developer.blender.org/D138
2013-12-27 18:52:41 +06:00
if (re->result == NULL) {
/* Clear UI drawing locks. */
if (re->draw_lock) {
re->draw_lock(re->dlh, 0);
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return 1;
Fix T36474: Blender 2.68a crashes upon rendering Summary: Original issue was caused by wring detection of whether SS modifier is being applied for render/viewport. After recent dependency graph commit this was no longer an issue. But it still might have happen conflict between viewport draw and scene_update_for_newframe() invoked from render thread when using external engines like Cycles. Solved by adding viewport lock while scene is being updated and objects being exported to the render engine. Same lock was already used for Blender Internal. Reviewers: brecht Reviewed By: brecht Maniphest Tasks: T36474 Differential Revision: https://developer.blender.org/D138
2013-12-27 18:52:41 +06:00
}
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Fix #29287: cycles and other external render engines did not print correct frame number in background render.
2011-11-16 12:47:37 +00:00
/* set render info */
style cleanup
2012-06-16 16:57:16 +00:00
re->i.cfra = re->scene->r.cfra;
fix [#32020] Image will not render in second (any scene other than first) if scene name is longer than 28 characters
2012-07-08 00:04:41 +00:00
BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name));
style cleanup
2012-06-16 16:57:16 +00:00
re->i.totface = re->i.totvert = re->i.totstrand = re->i.totlamp = re->i.tothalo = 0;
Fix #29287: cycles and other external render engines did not print correct frame number in background render.
2011-11-16 12:47:37 +00:00
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
/* render */
Cycles: persistent images option This option enables keeping loaded images in the memory in-between of rendering. Implemented by keeping render engine alive for until Render structure is being freed. Cycles will free all data when render finishes, optionally keeping image manager untouched. All shaders, meshes, objects will be re-allocated next time rendering happens. Cycles cession and scene will be re-created from scratch if render/ scene parameters were changed. This will also allow to keep compiled OSL shaders in memory without need to re-compile them again. P.S. Performance panel could be cleaned up a bit, not so much happy with it's vertical alignment currently but not sure how to make it look better. P.P.S. Currently the only way to free images from the device is to disable Persistent Images option and start rendering.
2012-11-09 08:46:53 +00:00
engine = re->engine;
Render Engines: fix crash when changing render engine during rendering Crash would have been happen when changing render ending at the same time rendering happens. It could be final Cycles render or even preview LUX render.
2012-11-13 11:00:46 +00:00
if (!engine) {
engine = RE_engine_create(type);
Highlight currently rendering tiles This commit implements highlight of tiles which are being currently rendered for both Blender Internal and Cycles (and should be possible to use it for other external engines as well). Couple of implementation details: - Added one extra boolean flag to render engine which should be set to truth if render engine wants to highlight tiles. If so, property use_highlight_tiles should be set to True. - Render Part's ready boolena was changed by status enum, which could be NONE, IN_PROGRESS and READY. All render part with IN_PROGRESS status will be highlighted in image editor. - For external engines render part's status is filling in automatically. Initially all render parts has got NONE status, then one external engine acquire render result, corresponding part will change status to IN_PROGRESS. As soon as render result is finished, corresponding render part will change status to FINISHED This should make it easy to highlight tiles for other engines as well.
2013-01-01 16:15:13 +00:00
re->engine = engine;
Render Engines: fix crash when changing render engine during rendering Crash would have been happen when changing render ending at the same time rendering happens. It could be final Cycles render or even preview LUX render.
2012-11-13 11:00:46 +00:00
}
engine->flag |= RE_ENGINE_RENDERING;
Cycles: persistent images option This option enables keeping loaded images in the memory in-between of rendering. Implemented by keeping render engine alive for until Render structure is being freed. Cycles will free all data when render finishes, optionally keeping image manager untouched. All shaders, meshes, objects will be re-allocated next time rendering happens. Cycles cession and scene will be re-created from scratch if render/ scene parameters were changed. This will also allow to keep compiled OSL shaders in memory without need to re-compile them again. P.S. Performance panel could be cleaned up a bit, not so much happy with it's vertical alignment currently but not sure how to make it look better. P.P.S. Currently the only way to free images from the device is to disable Persistent Images option and start rendering.
2012-11-09 08:46:53 +00:00
/* TODO: actually link to a parent which shouldn't happen */
style cleanup
2012-06-16 16:57:16 +00:00
engine->re = re;
Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22 17:01:54 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (re->flag & R_ANIMATION)
RenderEngine: add .is_animation and .is_preview properties to detect if it's an animation or preview render that is being done.
2011-11-02 13:36:28 +00:00
engine->flag |= RE_ENGINE_ANIMATION;
Fixes for blender internal viewport render: * Particles did not render at viewport resolution like meshes. * Properties editor preview render of hair was crashing, solution is to have two separate flags for this preview render and viewport preview render.
2013-05-15 17:09:45 +00:00
if (re->r.scemode & R_BUTS_PREVIEW)
RenderEngine: add .is_animation and .is_preview properties to detect if it's an animation or preview render that is being done.
2011-11-02 13:36:28 +00:00
engine->flag |= RE_ENGINE_PREVIEW;
Fix #30376: cycles ignores camera override from sequencer.
2012-04-13 17:42:03 +00:00
engine->camera_override = re->camera_override;
RenderEngine: add .is_animation and .is_preview properties to detect if it's an animation or preview render that is being done.
2011-11-02 13:36:28 +00:00
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
engine->resolution_x = re->winx;
engine->resolution_y = re->winy;
fix for re->partx/re->party values being different for RE_Database_FromScene() then the main render loop.
2012-11-21 10:20:38 +00:00
RE_parts_init(re, FALSE);
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
engine->tile_x = re->partx;
engine->tile_y = re->party;
if (re->result->do_exr_tile)
render_result_exr_file_begin(re);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (type->update)
RenderEngine: steps towards implementation of this proposal: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI * RenderEngine is now a persistent python object that exists and retains properties as long as a frame is being rendered. This is mostly useful now that more than one callback will be added. * Added update() callback that should ideally be used to export the scene, leaving only the rendering to the render() callback. This is not required to be used at this point, but separating this will make things more thread safe later on. * Added tag_redraw() and tag_update() functions that will be used for viewport rendering. * Internal change: status text is now retained after update_status calls.
2011-11-02 14:33:14 +00:00
type->update(engine, re->main, re->scene);
Fix T36474: Blender 2.68a crashes upon rendering Summary: Original issue was caused by wring detection of whether SS modifier is being applied for render/viewport. After recent dependency graph commit this was no longer an issue. But it still might have happen conflict between viewport draw and scene_update_for_newframe() invoked from render thread when using external engines like Cycles. Solved by adding viewport lock while scene is being updated and objects being exported to the render engine. Same lock was already used for Blender Internal. Reviewers: brecht Reviewed By: brecht Maniphest Tasks: T36474 Differential Revision: https://developer.blender.org/D138
2013-12-27 18:52:41 +06:00
/* Clear UI drawing locks. */
if (re->draw_lock) {
re->draw_lock(re->dlh, 0);
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (type->render)
RenderEngine: steps towards implementation of this proposal: http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI * RenderEngine is now a persistent python object that exists and retains properties as long as a frame is being rendered. This is mostly useful now that more than one callback will be added. * Added update() callback that should ideally be used to export the scene, leaving only the rendering to the render() callback. This is not required to be used at this point, but separating this will make things more thread safe later on. * Added tag_redraw() and tag_update() functions that will be used for viewport rendering. * Internal change: status text is now retained after update_status calls.
2011-11-02 14:33:14 +00:00
type->render(engine, re->scene);
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
Render Engines: fix crash when changing render engine during rendering Crash would have been happen when changing render ending at the same time rendering happens. It could be final Cycles render or even preview LUX render.
2012-11-13 11:00:46 +00:00
engine->tile_x = 0;
engine->tile_y = 0;
engine->flag &= ~RE_ENGINE_RENDERING;
Fix #33229: Blender crashes on finishing render
2012-11-19 16:42:14 +00:00
render_result_free_list(&engine->fullresult, engine->fullresult.first);
Render Engines: fix crash when changing render engine during rendering Crash would have been happen when changing render ending at the same time rendering happens. It could be final Cycles render or even preview LUX render.
2012-11-13 11:00:46 +00:00
/* re->engine becomes zero if user changed active render engine during render */
if (!persistent_data || !re->engine) {
RE_engine_free(engine);
Fix part of #33132: render resoltuion refresh issues after persistent images was added for cycles. This fixes the case where the option is disabled. I moved the option now to Blender itself and made it keep the engine around only when it's enabled. Also fixes case where there could be issues when switching to another renderer.
2012-11-09 23:54:58 +00:00
re->engine = NULL;
}
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
if (re->result->do_exr_tile) {
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
render_result_exr_file_end(re);
BLI_rw_mutex_unlock(&re->resultmutex);
}
fix for re->partx/re->party values being different for RE_Database_FromScene() then the main render loop.
2012-11-21 10:20:38 +00:00
RE_parts_free(re);
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (BKE_reports_contain(re->reports, RPT_ERROR))
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
2012-08-08 18:37:06 +00:00
G.is_break = TRUE;
Fix #30512: external render saved render result after reporting error.
2012-03-12 11:32:23 +00:00
Code refactoring: move external engine functions into own file.
2011-10-22 16:24:28 +00:00
return 1;
}
Copy Permalink