From 846d4d7b951b5f65108db490a6236d9d3eb0f183 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Mon, 15 Jun 2026 23:06:46 +0200 Subject: [PATCH] Narrow draw merge branch orchestration --- docs/modernization/debt.md | 4 ++++ docs/modernization/roadmap.md | 4 ++++ src/canvas.cpp | 3 +-- src/canvas.h | 3 +-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 3acda3af..43ad5ac5 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -401,6 +401,10 @@ agent or engineer to remove them without reconstructing context from chat. now drops the unused `draw_checkerboard` flag from the branch helper chain, shrinking the helper API mismatch while `Canvas::draw_merge_branch_orchestration()` still owns the remaining branch orchestration. +- 2026-06-15: `DEBT-0036` was narrowed again. `Canvas::draw_merge_branch_orchestration()` + now drops the unused `draw_checkerboard` parameter from the internal branch + wrapper, shrinking the remaining call-shape mismatch while the blocked + draw-merge extraction still stays in `STR-016`. - 2026-06-14: `DEBT-0036` was narrowed again. `Canvas::draw_merge_branch_orchestration()` now routes the temporary erase, temporary paint, texture, and blend dispatch bodies through retained helpers inside `execute_canvas_draw_merge_branch_body(...)`; diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index 28bb8660..94b02263 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -3227,6 +3227,10 @@ Results: API mismatch while `Canvas::draw_merge_branch_orchestration()` still owns the remaining branch orchestration. `STR-016` remains blocked until the helper shape is simplified enough to move the per-layer composite block out cleanly. +- `Canvas::draw_merge_branch_orchestration()` now drops the unused + `draw_checkerboard` parameter from the internal branch wrapper, shrinking the + remaining call-shape mismatch while the blocked draw-merge extraction still + stays in `STR-016`. - Canvas main-brush, dual-brush, and stroke-pad draw paths now use the tested `pp_paint_renderer` stroke-feedback plan to decide whether framebuffer fetch supplies destination color or the legacy OpenGL path must copy the target diff --git a/src/canvas.cpp b/src/canvas.cpp index fff97823..9d0646d2 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -1676,8 +1676,7 @@ void Canvas::draw_merge_branch_orchestration( const Brush& brush, const glm::mat4& ortho, bool use_blend, - bool copy_blend_destination, - bool draw_checkerboard) + bool copy_blend_destination) { if (!(m_show_tmp && m_current_layer_idx == layer_index) && (!layer->m_visible || diff --git a/src/canvas.h b/src/canvas.h index c2fff1b9..5b758717 100644 --- a/src/canvas.h +++ b/src/canvas.h @@ -275,8 +275,7 @@ private: const Brush& brush, const glm::mat4& ortho, bool use_blend, - bool copy_blend_destination, - bool draw_checkerboard); + bool copy_blend_destination); void draw_merge_final_plane_composite( const glm::mat4& ortho, bool draw_checkerboard);