From a16ac39d67f164ecd27539cb39b7333370405961 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Sun, 14 Jun 2026 00:18:25 +0200 Subject: [PATCH] Extract draw merge final composite gate helper --- src/canvas.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/canvas.cpp b/src/canvas.cpp index 77ff73d..9f78b93 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -508,6 +508,12 @@ static void execute_canvas_draw_merge_final_plane_composite( pp::panopainter::execute_legacy_canvas_draw_merge_final_plane_composite(uniforms, execution); } +static void execute_canvas_draw_merge_plane_final_composite( + Canvas& canvas, + const glm::mat4& ortho, + bool draw_checkerboard, + bool use_blend); + static void execute_canvas_draw_merge_plane_iteration( Canvas& canvas, const std::array& faces, @@ -561,15 +567,23 @@ static void execute_canvas_draw_merge_plane_iteration( draw_checkerboard); } - if (use_blend) - { - canvas.draw_merge_final_plane_composite(ortho, draw_checkerboard); - } - + execute_canvas_draw_merge_plane_final_composite(canvas, ortho, draw_checkerboard, use_blend); canvas.m_layers_merge.rtt(plane_index).unbindFramebuffer(); } } +static void execute_canvas_draw_merge_plane_final_composite( + Canvas& canvas, + const glm::mat4& ortho, + bool draw_checkerboard, + bool use_blend) +{ + if (use_blend) + { + canvas.draw_merge_final_plane_composite(ortho, draw_checkerboard); + } +} + static auto make_canvas_stroke_mix_pass_shell( Canvas& canvas, const glm::vec2& bb_min,