Remove dead draw merge temporary paint parameter

This commit is contained in:
2026-06-15 23:20:10 +02:00
parent 12cd9188e9
commit 55a79ee436
4 changed files with 7 additions and 9 deletions

View File

@@ -406,8 +406,8 @@ agent or engineer to remove them without reconstructing context from chat.
wrapper, shrinking the remaining call-shape mismatch while the blocked wrapper, shrinking the remaining call-shape mismatch while the blocked
draw-merge extraction still stays in `STR-016`. draw-merge extraction still stays in `STR-016`.
- 2026-06-15: `DEBT-0036` was narrowed again. `Canvas::draw_merge_temporary_paint_branch()` - 2026-06-15: `DEBT-0036` was narrowed again. `Canvas::draw_merge_temporary_paint_branch()`
now drops the unused `draw_checkerboard` parameter from the temporary-paint now drops the unused `copy_blend_destination` parameter from the temporary-paint
wrapper, shrinking the remaining draw-merge helper mismatch while the wrapper, shrinking the remaining draw-merge helper API mismatch while the
blocked extraction still stays in `STR-016`. blocked extraction still stays in `STR-016`.
- 2026-06-15: `DEBT-0036` was narrowed again. The stale - 2026-06-15: `DEBT-0036` was narrowed again. The stale
`make_canvas_draw_merge_branch_dispatch(...)` forward declaration in `make_canvas_draw_merge_branch_dispatch(...)` forward declaration in

View File

@@ -3235,9 +3235,9 @@ Results:
remaining call-shape mismatch while the blocked draw-merge extraction still remaining call-shape mismatch while the blocked draw-merge extraction still
stays in `STR-016`. stays in `STR-016`.
- `Canvas::draw_merge_temporary_paint_branch()` now drops the unused - `Canvas::draw_merge_temporary_paint_branch()` now drops the unused
`draw_checkerboard` parameter from the temporary-paint wrapper, shrinking the `copy_blend_destination` parameter from the temporary-paint wrapper,
remaining draw-merge helper mismatch while the blocked extraction still stays shrinking the remaining draw-merge helper API mismatch while the blocked
in `STR-016`. extraction still stays in `STR-016`.
- Canvas main-brush, dual-brush, and stroke-pad draw paths now use the tested - 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 `pp_paint_renderer` stroke-feedback plan to decide whether framebuffer fetch
supplies destination color or the legacy OpenGL path must copy the target supplies destination color or the legacy OpenGL path must copy the target

View File

@@ -1653,8 +1653,7 @@ void Canvas::draw_merge_temporary_paint_branch(
int plane_index, int plane_index,
std::shared_ptr<Layer> layer, std::shared_ptr<Layer> layer,
const Brush& brush, const Brush& brush,
const glm::mat4& ortho, const glm::mat4& ortho)
bool copy_blend_destination)
{ {
pp::panopainter::execute_legacy_canvas_draw_merge_temporary_composite( pp::panopainter::execute_legacy_canvas_draw_merge_temporary_composite(
make_canvas_draw_merge_temporary_paint_request( make_canvas_draw_merge_temporary_paint_request(

View File

@@ -265,8 +265,7 @@ private:
int plane_index, int plane_index,
std::shared_ptr<Layer> layer, std::shared_ptr<Layer> layer,
const Brush& brush, const Brush& brush,
const glm::mat4& ortho, const glm::mat4& ortho);
bool copy_blend_destination);
void draw_merge_branch_orchestration( void draw_merge_branch_orchestration(
int plane_index, int plane_index,
int layer_index, int layer_index,