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

Extract preview main pass orchestration

Browse Source
This commit is contained in:
omigamedev
2026-06-13 18:31:42 +02:00
parent 86777b26b5
commit fe16a6a270
5 changed files with 197 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/modernization/debt.md
View File

@@ -18,6 +18,11 @@ agent or engineer to remove them without reconstructing context from chat.
## Recent Reductions
- 2026-06-13: DEBT-0036 was narrowed again. `NodeStrokePreview::draw_stroke_immediate()`
now routes the main live-pass setup, frame execution, and preview copy-back
through `execute_legacy_node_stroke_preview_main_live_pass(...)`; the
retained path still owns the concrete frame mutation, sample shader setup,
and final mixer unbind.
- 2026-06-13: DEBT-0036 was narrowed again. `Canvas::draw_merge()` now routes
the remaining per-layer branch orchestration through
`execute_legacy_canvas_draw_merge_layer_composite(...)`; the retained path

8
docs/modernization/tasks.md
View File

@@ -1025,7 +1025,7 @@ Completed Task Log:
### STR-011 - Extract Preview Main Pass Orchestration
Status: Ready
Status: Done
Score: no score movement
Debt: `DEBT-0036`
Scope: `src/node_stroke_preview.cpp`, `tests/paint_renderer/compositor_tests.cpp`
@@ -1050,6 +1050,12 @@ ctest --preset desktop-fast --build-config Debug -R "pp_paint_renderer_composito
cmake --build --preset windows-msvc-default --config Debug --target PanoPainter
```
Completed Task Log:
| Date | Task | Score | Validation | Commit |
| --- | --- | ---: | --- | --- |
| 2026-06-13 | STR-011 | no score movement | `ctest --preset desktop-fast --build-config Debug -R "pp_paint_renderer_compositor|pp_paint_renderer_stroke_execution" --output-on-failure`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | `pending` |
### STR-010 - Extract Remaining Draw Merge Composite Orchestration
Status: Done

54
src/legacy_node_stroke_preview_execution_services.h
View File

@@ -234,6 +234,60 @@ struct LegacyNodeStrokePreviewPassOrchestrationPlan {
bool background_colorize = false;
};
template <typename Frame>
struct LegacyNodeStrokePreviewMainLivePassRequestT {
std::function<void()> setup_blend_uniforms;
std::function<void()> bind_main_pass_textures;
std::function<void()> clear_target;
std::function<std::vector<Frame>()> compute_frames;
std::function<void(Frame&)> before_frame;
std::function<void(Frame&)> setup_sample_shader;
std::function<void(Frame&)> draw_sample;
std::function<void()> copy_pass_result;
std::function<void()> finish_main_pass;
};
template <typename Frame>
[[nodiscard]] inline bool execute_legacy_node_stroke_preview_main_live_pass(
const LegacyNodeStrokePreviewMainLivePassRequestT<Frame>& request)
{
if (!request.setup_blend_uniforms ||
!request.bind_main_pass_textures ||
!request.clear_target ||
!request.compute_frames ||
!request.before_frame ||
!request.setup_sample_shader ||
!request.draw_sample ||
!request.copy_pass_result ||
!request.finish_main_pass) {
return false;
}
request.setup_blend_uniforms();
request.bind_main_pass_textures();
pp::panopainter::execute_legacy_stroke_preview_live_pass(
[&] {
request.clear_target();
},
[&] {
return request.compute_frames();
},
[&](Frame& frame) {
request.before_frame(frame);
},
[&](Frame& frame) {
request.setup_sample_shader(frame);
},
[&](Frame& frame) {
request.draw_sample(frame);
},
[&] {
request.copy_pass_result();
});
request.finish_main_pass();
return true;
}
struct LegacyNodeStrokePreviewPassOrchestrationRequest {
pp::renderer::RenderDeviceFeatures features {};
glm::vec2 preview_size {};

95
src/node_stroke_preview.cpp
View File

@@ -779,47 +779,66 @@ void NodeStrokePreview::draw_stroke_immediate()
pass_orchestration.composite.uses_mixer);
},
.execute_main_pass = [&] {
pp::panopainter::execute_legacy_stroke_preview_live_pass(
[&] {
m_rtt.clear();
},
[&] {
return stroke_draw_compute(m_stroke, zoom);
},
[&](auto& frame) {
if (b->m_tip_mix > 0.f)
{
stroke_draw_mix(xy(frame.m_mixer_rect), zw(frame.m_mixer_rect));
}
[[maybe_unused]] const bool main_live_ok =
pp::panopainter::execute_legacy_node_stroke_preview_main_live_pass(
pp::panopainter::LegacyNodeStrokePreviewMainLivePassRequestT<StrokeFrame> {
.setup_blend_uniforms = [&] {
pp::panopainter::apply_legacy_stroke_blend_uniforms(
material.stroke_pass.uses_pattern,
b->m_tip_mix,
b->m_tip_wet,
b->m_tip_noise);
},
.bind_main_pass_textures = [&] {
bind_stroke_preview_main_pass_textures(
*b,
m_tex,
m_rtt_mixer,
copy_stroke_destination,
material.stroke_pass.uses_mixer);
},
.clear_target = [&] {
m_rtt.clear();
},
.compute_frames = [&] {
return stroke_draw_compute(m_stroke, zoom);
},
.before_frame = [&](auto& frame) {
if (b->m_tip_mix > 0.f)
{
stroke_draw_mix(xy(frame.m_mixer_rect), zw(frame.m_mixer_rect));
}
frame.col = b->m_blend_mode != 0 || b->m_tip_mix > 0.f ?
glm::vec4 { .7, .4, .1, 1 } :
glm::vec4 { 0, 0, 0, 1 };
frame.flow = glm::max(frame.flow, m_min_flow);
},
[&](auto& frame) {
pp::panopainter::use_legacy_stroke_shader();
pp::panopainter::apply_legacy_stroke_sample_uniforms(
pp::panopainter::LegacyStrokeSampleUniforms {
.color = frame.col,
.alpha = frame.flow,
.opacity = frame.opacity,
});
},
[&](auto& frame) {
/*auto rect =*/ stroke_draw_samples(frame.shapes, m_tex, copy_stroke_destination);
},
[&] {
copy_stroke_preview_framebuffer_to_texture(
m_tex,
size,
stroke_preview_composite_slots::kStroke);
frame.col = b->m_blend_mode != 0 || b->m_tip_mix > 0.f ?
glm::vec4 { .7, .4, .1, 1 } :
glm::vec4 { 0, 0, 0, 1 };
frame.flow = glm::max(frame.flow, m_min_flow);
},
.setup_sample_shader = [&](auto& frame) {
pp::panopainter::use_legacy_stroke_shader();
pp::panopainter::apply_legacy_stroke_sample_uniforms(
pp::panopainter::LegacyStrokeSampleUniforms {
.color = frame.col,
.alpha = frame.flow,
.opacity = frame.opacity,
});
},
.draw_sample = [&](auto& frame) {
/*auto rect =*/ stroke_draw_samples(frame.shapes, m_tex, copy_stroke_destination);
},
.copy_pass_result = [&] {
copy_stroke_preview_framebuffer_to_texture(
m_tex,
size,
stroke_preview_composite_slots::kStroke);
},
.finish_main_pass = [&] {
set_active_texture_unit(stroke_preview_live_slots::kMixer);
m_rtt_mixer.unbindTexture();
},
});
},
.finish_main_pass = [&] {
set_active_texture_unit(stroke_preview_live_slots::kMixer);
m_rtt_mixer.unbindTexture();
},
.finish_main_pass = [&] {},
.execute_final_composite = [&] {
execute_stroke_preview_final_composite_pass(
StrokePreviewCompositePassInputs {

74
tests/paint_renderer/compositor_tests.cpp
View File

@@ -2540,6 +2540,77 @@ void legacy_node_stroke_preview_pass_sequence_preserves_dual_main_and_composite_
PP_EXPECT(h, !missing_required);
}
void legacy_node_stroke_preview_main_live_pass_preserves_order(pp::tests::Harness& h)
{
struct Frame {
int id = 0;
};
std::vector<std::string> steps;
const auto run = [&](std::vector<Frame> frames) {
steps.clear();
const bool ok = pp::panopainter::execute_legacy_node_stroke_preview_main_live_pass<Frame>(
pp::panopainter::LegacyNodeStrokePreviewMainLivePassRequestT<Frame> {
.setup_blend_uniforms = [&] {
steps.emplace_back("setup_blend");
},
.bind_main_pass_textures = [&] {
steps.emplace_back("bind_textures");
},
.clear_target = [&] {
steps.emplace_back("clear");
},
.compute_frames = [&] {
steps.emplace_back("compute");
return frames;
},
.before_frame = [&](Frame& frame) {
steps.emplace_back("before:" + std::to_string(frame.id));
},
.setup_sample_shader = [&](Frame& frame) {
steps.emplace_back("setup:" + std::to_string(frame.id));
},
.draw_sample = [&](Frame& frame) {
steps.emplace_back("draw:" + std::to_string(frame.id));
},
.copy_pass_result = [&] {
steps.emplace_back("copy");
},
.finish_main_pass = [&] {
steps.emplace_back("finish");
},
});
PP_EXPECT(h, ok);
};
run({});
PP_EXPECT(h, steps == std::vector<std::string> {
"setup_blend",
"bind_textures",
"compute",
"clear",
"copy",
"finish",
});
run({ Frame { .id = 7 } });
PP_EXPECT(h, steps == std::vector<std::string> {
"setup_blend",
"bind_textures",
"compute",
"clear",
"before:7",
"setup:7",
"draw:7",
"copy",
"finish",
});
const bool invalid = pp::panopainter::execute_legacy_node_stroke_preview_main_live_pass<Frame>(
pp::panopainter::LegacyNodeStrokePreviewMainLivePassRequestT<Frame> {});
PP_EXPECT(h, !invalid);
}
void legacy_node_stroke_preview_stroke_setup_plan_preserves_curve_and_dual_inputs(pp::tests::Harness& h)
{
const auto plan = pp::panopainter::plan_legacy_node_stroke_preview_stroke_setup(
@@ -3130,6 +3201,9 @@ int main()
harness.run(
"legacy_node_stroke_preview_pass_sequence_preserves_dual_main_and_composite_order",
legacy_node_stroke_preview_pass_sequence_preserves_dual_main_and_composite_order);
harness.run(
"legacy_node_stroke_preview_main_live_pass_preserves_order",
legacy_node_stroke_preview_main_live_pass_preserves_order);
harness.run(
"legacy_node_stroke_preview_stroke_setup_plan_preserves_curve_and_dual_inputs",
legacy_node_stroke_preview_stroke_setup_plan_preserves_curve_and_dual_inputs);