diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 13:36:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 14:59:55 +0300 |
commit | 96f0d22e3b8a2c50cdb96e82146489f26628c127 (patch) | |
tree | 2ecef745ab89b30f8ce3c59e6c85acf568a5ae8b /source/blender/render | |
parent | 8c40bbb15f10601737bcd6652f0358d51102d045 (diff) |
Cleanup: remove unused render buffers
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 10 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 29 |
2 files changed, 0 insertions, 39 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index db051d58d6c..93b85b6b96a 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -100,16 +100,6 @@ typedef struct RenderLayer { char name[RE_MAXNAME]; int layflag, passflag, pass_xor; - /* MULTIVIEW_TODO: acolrect and scolrect are not supported by multiview at the moment. - * If they are really required they should be in RenderView instead */ - - /** 4 float, optional transparent buffer, needs storage for display updates */ - float *acolrect; - /** 4 float, optional strand buffer, needs storage for display updates */ - float *scolrect; - /** 4 char, optional color managed display buffer which is used when - * Save Buffer is enabled to display combined pass of the screen. */ - int *display_buffer; int rectx, recty; /** Optional saved endresult on disk. */ diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 04dabad611f..8a95cc6397f 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -90,18 +90,6 @@ void render_result_free(RenderResult *res) while (res->layers.first) { RenderLayer *rl = res->layers.first; - /* acolrect and scolrect are optionally allocated in shade_tile, - * only free here since it can be used for drawing. */ - if (rl->acolrect) { - MEM_freeN(rl->acolrect); - } - if (rl->scolrect) { - MEM_freeN(rl->scolrect); - } - if (rl->display_buffer) { - MEM_freeN(rl->display_buffer); - } - while (rl->passes.first) { RenderPass *rpass = rl->passes.first; if (rpass->rect) { @@ -350,12 +338,6 @@ RenderResult *render_result_new(Render *re, rl->recty = recty; if (rr->do_exr_tile) { - rl->display_buffer = MEM_mapallocN((size_t)rectx * recty * sizeof(unsigned int), - "Combined display space rgba"); - if (rl->display_buffer == NULL) { - render_result_free(rr); - return NULL; - } rl->exrhandle = IMB_exr_get_handle(); } @@ -470,8 +452,6 @@ RenderResult *render_result_new(Render *re, /* duplicate code... */ if (rr->do_exr_tile) { - rl->display_buffer = MEM_mapallocN(rectx * recty * sizeof(unsigned int), - "Combined display space rgba"); rl->exrhandle = IMB_exr_get_handle(); } @@ -1653,15 +1633,6 @@ static RenderLayer *duplicate_render_layer(RenderLayer *rl) new_rl->next = new_rl->prev = NULL; new_rl->passes.first = new_rl->passes.last = NULL; new_rl->exrhandle = NULL; - if (new_rl->acolrect != NULL) { - new_rl->acolrect = MEM_dupallocN(new_rl->acolrect); - } - if (new_rl->scolrect != NULL) { - new_rl->scolrect = MEM_dupallocN(new_rl->scolrect); - } - if (new_rl->display_buffer != NULL) { - new_rl->display_buffer = MEM_dupallocN(new_rl->display_buffer); - } for (RenderPass *rpass = rl->passes.first; rpass != NULL; rpass = rpass->next) { RenderPass *new_rpass = duplicate_render_pass(rpass); BLI_addtail(&new_rl->passes, new_rpass); |