[Bf-blender-cvs] [27ea45a0cbc] compositor-cryptomatte-workflow: Reverted wrong merge: Draw manager render result.
Jeroen Bakker
noreply at git.blender.org
Tue Feb 16 09:47:21 CET 2021
Commit: 27ea45a0cbcae77f43865183c8ea545660cb39ca
Author: Jeroen Bakker
Date: Mon Feb 15 12:28:59 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB27ea45a0cbcae77f43865183c8ea545660cb39ca
Reverted wrong merge: Draw manager render result.
===================================================================
M source/blender/draw/engines/eevee/eevee_cryptomatte.c
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/eevee/eevee_render.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/draw/engines/gpencil/gpencil_render.c
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/draw/engines/workbench/workbench_render.c
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
index f15d541f86d..13a3f1766a9 100644
--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
@@ -613,8 +613,7 @@ static void eevee_cryptomatte_extract_render_passes(
}
}
-void EEVEE_cryptomatte_render_result(RenderResult *render_result,
- RenderLayer *rl,
+void EEVEE_cryptomatte_render_result(RenderLayer *rl,
const char *viewname,
const rcti *rect,
EEVEE_Data *vedata,
@@ -657,11 +656,6 @@ void EEVEE_cryptomatte_render_result(RenderResult *render_result,
rect_offset_x,
rect_offset_y,
viewport_width);
- BKE_cryptomatte_store_metadata(g_data->cryptomatte_session,
- render_result,
- view_layer,
- VIEW_LAYER_CRYPTOMATTE_OBJECT,
- "CryptoObject");
layer_index++;
}
if ((cryptomatte_layers & VIEW_LAYER_CRYPTOMATTE_MATERIAL) != 0) {
@@ -679,11 +673,6 @@ void EEVEE_cryptomatte_render_result(RenderResult *render_result,
rect_offset_x,
rect_offset_y,
viewport_width);
- BKE_cryptomatte_store_metadata(g_data->cryptomatte_session,
- render_result,
- view_layer,
- VIEW_LAYER_CRYPTOMATTE_MATERIAL,
- "CryptoMaterial");
layer_index++;
}
if ((cryptomatte_layers & VIEW_LAYER_CRYPTOMATTE_ASSET) != 0) {
@@ -701,11 +690,6 @@ void EEVEE_cryptomatte_render_result(RenderResult *render_result,
rect_offset_x,
rect_offset_y,
viewport_width);
- BKE_cryptomatte_store_metadata(g_data->cryptomatte_session,
- render_result,
- view_layer,
- VIEW_LAYER_CRYPTOMATTE_ASSET,
- "CryptoAsset");
layer_index++;
}
}
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 379da2691a8..d1238d7b82e 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -440,7 +440,6 @@ static void eevee_render_reset_passes(EEVEE_Data *vedata)
static void eevee_render_to_image(void *vedata,
RenderEngine *engine,
- struct RenderResult *render_result,
struct RenderLayer *render_layer,
const rcti *rect)
{
@@ -579,7 +578,7 @@ static void eevee_render_to_image(void *vedata,
return;
}
- EEVEE_render_read_result(vedata, engine, render_result, render_layer, rect);
+ EEVEE_render_read_result(vedata, engine, render_layer, rect);
/* Restore original viewport size. */
DRW_render_viewport_size_set((int[2]){g_data->size_orig[0], g_data->size_orig[1]});
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 580abba5b22..17d0ead86c5 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -1353,8 +1353,7 @@ void EEVEE_cryptomatte_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data
void EEVEE_cryptomatte_update_passes(struct RenderEngine *engine,
struct Scene *scene,
struct ViewLayer *view_layer);
-void EEVEE_cryptomatte_render_result(struct RenderResult *render_result,
- struct RenderLayer *rl,
+void EEVEE_cryptomatte_render_result(struct RenderLayer *rl,
const char *viewname,
const rcti *rect,
EEVEE_Data *vedata,
@@ -1501,7 +1500,6 @@ void EEVEE_render_draw(EEVEE_Data *vedata,
const struct rcti *rect);
void EEVEE_render_read_result(EEVEE_Data *vedata,
struct RenderEngine *engine,
- struct RenderResult *render_result,
struct RenderLayer *rl,
const rcti *rect);
void EEVEE_render_update_passes(struct RenderEngine *engine,
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c
index 80d6ada777b..bc05b7915c3 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -501,15 +501,14 @@ static void eevee_render_result_aovs(RenderLayer *rl,
#undef EEVEE_RENDER_RESULT_MATERIAL_PASS
-static void eevee_render_result_cryptomatte(RenderResult *render_result,
- RenderLayer *rl,
+static void eevee_render_result_cryptomatte(RenderLayer *rl,
const char *viewname,
const rcti *rect,
EEVEE_Data *vedata,
EEVEE_ViewLayerData *sldata)
{
if ((vedata->stl->g_data->render_passes & EEVEE_RENDER_PASS_CRYPTOMATTE) != 0) {
- EEVEE_cryptomatte_render_result(render_result, rl, viewname, rect, vedata, sldata);
+ EEVEE_cryptomatte_render_result(rl, viewname, rect, vedata, sldata);
}
}
@@ -671,7 +670,6 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl
void EEVEE_render_read_result(EEVEE_Data *vedata,
RenderEngine *engine,
- struct RenderResult *render_result,
RenderLayer *rl,
const rcti *rect)
{
@@ -691,7 +689,7 @@ void EEVEE_render_read_result(EEVEE_Data *vedata,
eevee_render_result_bloom(rl, viewname, rect, vedata, sldata);
eevee_render_result_volume_light(rl, viewname, rect, vedata, sldata);
eevee_render_result_aovs(rl, viewname, rect, vedata, sldata);
- eevee_render_result_cryptomatte(render_result, rl, viewname, rect, vedata, sldata);
+ eevee_render_result_cryptomatte(rl, viewname, rect, vedata, sldata);
}
void EEVEE_render_update_passes(RenderEngine *engine, Scene *scene, ViewLayer *view_layer)
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 22930f90c6c..5ceb909bc88 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -441,7 +441,6 @@ void GPENCIL_render_init(struct GPENCIL_Data *ved,
const rcti *rect);
void GPENCIL_render_to_image(void *vedata,
struct RenderEngine *engine,
- struct RenderResult *render_result,
struct RenderLayer *render_layer,
const rcti *rect);
diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c
index 4305abd250e..b597a786e86 100644
--- a/source/blender/draw/engines/gpencil/gpencil_render.c
+++ b/source/blender/draw/engines/gpencil/gpencil_render.c
@@ -242,7 +242,6 @@ static void GPENCIL_render_result_combined(struct RenderLayer *rl,
void GPENCIL_render_to_image(void *ved,
RenderEngine *engine,
- struct RenderResult *UNUSED(render_result),
struct RenderLayer *render_layer,
const rcti *rect)
{
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
index 6c64f8af734..6247436feea 100644
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@ -541,7 +541,6 @@ void workbench_draw_finish(void *ved);
/* workbench_render.c */
void workbench_render(void *ved,
struct RenderEngine *engine,
- struct RenderResult *render_result,
struct RenderLayer *render_layer,
const struct rcti *rect);
void workbench_render_update_passes(struct RenderEngine *engine,
diff --git a/source/blender/draw/engines/workbench/workbench_render.c b/source/blender/draw/engines/workbench/workbench_render.c
index c00fe1ac238..f2d178f6565 100644
--- a/source/blender/draw/engines/workbench/workbench_render.c
+++ b/source/blender/draw/engines/workbench/workbench_render.c
@@ -162,11 +162,7 @@ static void workbench_render_result_z(struct RenderLayer *rl,
}
}
-void workbench_render(void *ved,
- RenderEngine *engine,
- RenderResult *UNUSED(render_result),
- RenderLayer *render_layer,
- const rcti *rect)
+void workbench_render(void *ved, RenderEngine *engine, RenderLayer *render_layer, const rcti *rect)
{
WORKBENCH_Data *data = ved;
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 4420e5e50db..2545cfa65dc 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -129,7 +129,6 @@ typedef struct DrawEngineType {
void (*render_to_image)(void *vedata,
struct RenderEngine *engine,
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list