Cleanup: Remove unused z_buffer from render result and view
They are not needed since the #109687 Pull Request: https://projects.blender.org/blender/blender/pulls/109702
This commit is contained in:
parent
d70de7c289
commit
b441a28ea0
@ -195,7 +195,6 @@ static void screen_opengl_views_setup(OGLRender *oglrender)
|
||||
BLI_remlink(&rr->views, rv_del);
|
||||
|
||||
RE_RenderBuffer_data_free(&rv_del->combined_buffer);
|
||||
RE_RenderBuffer_data_free(&rv_del->z_buffer);
|
||||
RE_RenderByteBuffer_data_free(&rv_del->byte_buffer);
|
||||
|
||||
MEM_freeN(rv_del);
|
||||
@ -221,7 +220,6 @@ static void screen_opengl_views_setup(OGLRender *oglrender)
|
||||
BLI_remlink(&rr->views, rv_del);
|
||||
|
||||
RE_RenderBuffer_data_free(&rv_del->combined_buffer);
|
||||
RE_RenderBuffer_data_free(&rv_del->z_buffer);
|
||||
RE_RenderByteBuffer_data_free(&rv_del->byte_buffer);
|
||||
|
||||
MEM_freeN(rv_del);
|
||||
|
@ -75,7 +75,6 @@ typedef struct RenderView {
|
||||
|
||||
/* if this exists, result of composited layers */
|
||||
RenderBuffer combined_buffer;
|
||||
RenderBuffer z_buffer;
|
||||
|
||||
/* optional, 32 bits version of picture, used for sequencer, OpenGL render and image curves */
|
||||
RenderByteBuffer byte_buffer;
|
||||
@ -135,7 +134,6 @@ typedef struct RenderResult {
|
||||
|
||||
/* if this exists, a copy of one of layers, or result of composited layers */
|
||||
RenderBuffer combined_buffer;
|
||||
RenderBuffer z_buffer;
|
||||
|
||||
/* coordinates within final image (after cropping) */
|
||||
rcti tilerect;
|
||||
|
@ -399,15 +399,6 @@ void RE_AcquireResultImageViews(Render *re, RenderResult *rr)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (rv->z_buffer.data == nullptr) {
|
||||
LISTBASE_FOREACH (RenderView *, rview, &rr->views) {
|
||||
RenderBuffer *buffer = RE_RenderLayerGetPassBuffer(rl, RE_PASSNAME_Z, rview->name);
|
||||
if (buffer) {
|
||||
rview->z_buffer = *buffer;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rr->layers = re->result->layers;
|
||||
@ -451,7 +442,6 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id)
|
||||
*
|
||||
* The thread safety is ensured via the re->resultmutex. */
|
||||
rr->combined_buffer = rv->combined_buffer;
|
||||
rr->z_buffer = rv->z_buffer;
|
||||
rr->byte_buffer = rv->byte_buffer;
|
||||
|
||||
/* active layer */
|
||||
@ -464,13 +454,6 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id)
|
||||
rr->combined_buffer = *buffer;
|
||||
}
|
||||
}
|
||||
|
||||
if (rv->z_buffer.data == nullptr) {
|
||||
RenderBuffer *buffer = RE_RenderLayerGetPassBuffer(rl, RE_PASSNAME_Z, rv->name);
|
||||
if (buffer) {
|
||||
rr->z_buffer = *buffer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rr->layers = re->result->layers;
|
||||
|
@ -56,7 +56,6 @@ static void render_result_views_free(RenderResult *rr)
|
||||
|
||||
RE_RenderByteBuffer_data_free(&rv->byte_buffer);
|
||||
RE_RenderBuffer_data_free(&rv->combined_buffer);
|
||||
RE_RenderBuffer_data_free(&rv->z_buffer);
|
||||
|
||||
MEM_freeN(rv);
|
||||
}
|
||||
@ -88,7 +87,6 @@ void render_result_free(RenderResult *rr)
|
||||
|
||||
RE_RenderByteBuffer_data_free(&rr->byte_buffer);
|
||||
RE_RenderBuffer_data_free(&rr->combined_buffer);
|
||||
RE_RenderBuffer_data_free(&rr->z_buffer);
|
||||
|
||||
if (rr->text) {
|
||||
MEM_freeN(rr->text);
|
||||
@ -146,7 +144,6 @@ void render_result_views_shallowcopy(RenderResult *dst, RenderResult *src)
|
||||
STRNCPY(rv->name, rview->name);
|
||||
|
||||
rv->combined_buffer = rview->combined_buffer;
|
||||
rv->z_buffer = rview->z_buffer;
|
||||
rv->byte_buffer = rview->byte_buffer;
|
||||
}
|
||||
}
|
||||
@ -1206,7 +1203,6 @@ static RenderView *duplicate_render_view(RenderView *rview)
|
||||
|
||||
/* Reset buffers, they are not supposed to be shallow-coped. */
|
||||
new_rview->combined_buffer = {};
|
||||
new_rview->z_buffer = {};
|
||||
new_rview->byte_buffer = {};
|
||||
|
||||
if (rview->combined_buffer.data != nullptr) {
|
||||
@ -1214,11 +1210,6 @@ static RenderView *duplicate_render_view(RenderView *rview)
|
||||
static_cast<float *>(MEM_dupallocN(rview->combined_buffer.data)));
|
||||
}
|
||||
|
||||
if (rview->z_buffer.data != nullptr) {
|
||||
RE_RenderBuffer_assign_data(&new_rview->z_buffer,
|
||||
static_cast<float *>(MEM_dupallocN(rview->z_buffer.data)));
|
||||
}
|
||||
|
||||
if (rview->byte_buffer.data != nullptr) {
|
||||
RE_RenderByteBuffer_assign_data(
|
||||
&new_rview->byte_buffer, static_cast<uint8_t *>(MEM_dupallocN(rview->byte_buffer.data)));
|
||||
@ -1244,17 +1235,12 @@ RenderResult *RE_DuplicateRenderResult(RenderResult *rr)
|
||||
|
||||
/* Reset buffers, they are not supposed to be shallow-coped. */
|
||||
new_rr->combined_buffer = {};
|
||||
new_rr->z_buffer = {};
|
||||
new_rr->byte_buffer = {};
|
||||
|
||||
if (rr->combined_buffer.data) {
|
||||
RE_RenderBuffer_assign_data(&new_rr->combined_buffer,
|
||||
static_cast<float *>(MEM_dupallocN(rr->combined_buffer.data)));
|
||||
}
|
||||
if (rr->z_buffer.data) {
|
||||
RE_RenderBuffer_assign_data(&new_rr->z_buffer,
|
||||
static_cast<float *>(MEM_dupallocN(rr->z_buffer.data)));
|
||||
}
|
||||
if (rr->byte_buffer.data) {
|
||||
RE_RenderByteBuffer_assign_data(&new_rr->byte_buffer,
|
||||
static_cast<uint8_t *>(MEM_dupallocN(rr->byte_buffer.data)));
|
||||
|
Loading…
Reference in New Issue
Block a user