diff options
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 7 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index c680fd5864c..5eb2344bffe 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -72,7 +72,6 @@ static struct { struct GPUTexture *specular_buffer_tx; /* ref only, not alloced */ struct GPUTexture *normal_buffer_tx; /* ref only, not alloced */ struct GPUTexture *composite_buffer_tx; /* ref only, not alloced */ - struct GPUTexture *effect_buffer_tx; /* ref only, not alloced */ SceneDisplay display; /* world light direction for shadows */ int next_object_id; @@ -346,8 +345,6 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata) e_data.specular_buffer_tx = DRW_texture_pool_query_2D(size[0], size[1], GPU_RGBA8, &draw_engine_workbench_solid); e_data.composite_buffer_tx = DRW_texture_pool_query_2D( size[0], size[1], GPU_RGBA16F, &draw_engine_workbench_solid); - e_data.effect_buffer_tx = DRW_texture_pool_query_2D( - size[0], size[1], GPU_RGBA16F, &draw_engine_workbench_solid); if (NORMAL_ENCODING_ENABLED()) { e_data.normal_buffer_tx = DRW_texture_pool_query_2D( @@ -375,7 +372,7 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata) }); GPU_framebuffer_ensure_config(&fbl->effect_fb, { GPU_ATTACHMENT_NONE, - GPU_ATTACHMENT_TEXTURE(e_data.effect_buffer_tx), + GPU_ATTACHMENT_TEXTURE(e_data.color_buffer_tx), }); } @@ -410,7 +407,7 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata) } { - workbench_aa_create_pass(vedata, &e_data.effect_buffer_tx); + workbench_aa_create_pass(vedata, &e_data.color_buffer_tx); } { diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 1a8a5461e13..9cc01149067 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -58,7 +58,6 @@ static struct { struct GPUTexture *transparent_accum_tx; /* ref only, not alloced */ struct GPUTexture *transparent_revealage_tx; /* ref only, not alloced */ struct GPUTexture *composite_buffer_tx; /* ref only, not alloced */ - struct GPUTexture *effect_buffer_tx; /* ref only, not alloced */ int next_object_id; float normal_world_matrix[3][3]; @@ -306,8 +305,6 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata) size[0], size[1], GPU_R16F, &draw_engine_workbench_transparent); e_data.composite_buffer_tx = DRW_texture_pool_query_2D( size[0], size[1], GPU_R11F_G11F_B10F, &draw_engine_workbench_transparent); - e_data.effect_buffer_tx = DRW_texture_pool_query_2D( - size[0], size[1], GPU_RGBA16F, &draw_engine_workbench_solid); GPU_framebuffer_ensure_config(&fbl->object_outline_fb, { GPU_ATTACHMENT_TEXTURE(dtxl->depth), @@ -326,7 +323,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata) }); GPU_framebuffer_ensure_config(&fbl->effect_fb, { GPU_ATTACHMENT_NONE, - GPU_ATTACHMENT_TEXTURE(e_data.effect_buffer_tx), + GPU_ATTACHMENT_TEXTURE(e_data.transparent_accum_tx), }); /* Transparency Accum */ @@ -356,7 +353,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata) } { - workbench_aa_create_pass(vedata, &e_data.effect_buffer_tx); + workbench_aa_create_pass(vedata, &e_data.transparent_accum_tx); } /* Checker Depth */ |