omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Narrow draw merge branch helper surface

Browse Source
This commit is contained in:
omigamedev
2026-06-15 23:00:23 +02:00
parent eacf862c0b
commit 2a585f0058
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/canvas.cpp
View File

@@ -602,8 +602,7 @@ static void execute_canvas_draw_merge_branch_body(
const Brush& brush, const Brush& brush,
const glm::mat4& ortho, const glm::mat4& ortho,
bool use_blend, bool use_blend,
bool copy_blend_destination, bool copy_blend_destination)
bool draw_checkerboard)
{ {
if (use_blend) if (use_blend)
{ {
@@ -622,8 +621,7 @@ static void execute_canvas_draw_merge_branch_body(
layer, layer,
brush, brush,
ortho, ortho,
copy_blend_destination, copy_blend_destination));
draw_checkerboard));
} }
static pp::panopainter::LegacyCanvasDrawMergeLayerCompositeExecution make_canvas_draw_merge_branch_dispatch( static pp::panopainter::LegacyCanvasDrawMergeLayerCompositeExecution make_canvas_draw_merge_branch_dispatch(
@@ -633,8 +631,7 @@ static pp::panopainter::LegacyCanvasDrawMergeLayerCompositeExecution make_canvas
const std::shared_ptr<Layer>& layer, const std::shared_ptr<Layer>& layer,
const Brush& brush, const Brush& brush,
const glm::mat4& ortho, const glm::mat4& ortho,
bool copy_blend_destination, bool copy_blend_destination)
bool draw_checkerboard)
{ {
return pp::panopainter::LegacyCanvasDrawMergeLayerCompositeExecution { return pp::panopainter::LegacyCanvasDrawMergeLayerCompositeExecution {
.execute_temporary_erase = [&] { .execute_temporary_erase = [&] {
@@ -646,7 +643,6 @@ static pp::panopainter::LegacyCanvasDrawMergeLayerCompositeExecution make_canvas
ortho); ortho);
}, },
.execute_temporary_paint = [&] { .execute_temporary_paint = [&] {
(void)draw_checkerboard;
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(
canvas, canvas,
@@ -1696,8 +1692,7 @@ void Canvas::draw_merge_branch_orchestration(
brush, brush,
ortho, ortho,
use_blend, use_blend,
copy_blend_destination, copy_blend_destination);
draw_checkerboard);
} }
void Canvas::draw_merge_final_plane_composite( void Canvas::draw_merge_final_plane_composite(