Extract main stroke face loop

This commit is contained in:
2026-06-13 17:58:45 +02:00
parent 9acd3fa524
commit fee09e5340
5 changed files with 113 additions and 2 deletions

View File

@@ -1369,6 +1369,74 @@ void retained_stroke_dual_pass_frame_callbacks_preserve_order(pp::tests::Harness
PP_EXPECT(h, events == expected_events);
}
void retained_stroke_main_pass_frame_callbacks_preserve_order(pp::tests::Harness& h)
{
StrokeFrame frame;
frame.id = 31;
frame.shapes[0] = {
vertex_t(glm::vec2(5.0F, 5.0F)),
vertex_t(glm::vec2(6.0F, 5.0F)),
vertex_t(glm::vec2(6.0F, 6.0F)),
};
frame.shapes[2] = {
vertex_t(glm::vec2(7.0F, 7.0F)),
vertex_t(glm::vec2(8.0F, 7.0F)),
vertex_t(glm::vec2(8.0F, 8.0F)),
};
std::array<StrokeFrame, 1> frames { frame };
std::array<glm::vec4, 6> accumulated_dirty_boxes;
std::array<glm::vec4, 6> pass_dirty_boxes;
accumulated_dirty_boxes.fill(glm::vec4(64.0F, 64.0F, 0.0F, 0.0F));
pass_dirty_boxes.fill(glm::vec4(64.0F, 64.0F, 0.0F, 0.0F));
std::array<bool, 6> include_in_committed_dirty_box { true, true, true, true, true, true };
std::vector<std::string> events;
std::array<DummyFramebuffer, 6> face_framebuffers {};
for (int face_index = 0; face_index < 6; ++face_index) {
face_framebuffers[face_index].events = &events;
face_framebuffers[face_index].face_index = face_index;
}
const auto executed_faces = pp::panopainter::execute_legacy_canvas_stroke_main_pass_frame_callbacks(
frames,
pp::renderer::Extent2D { .width = 64, .height = 64 },
accumulated_dirty_boxes,
pass_dirty_boxes,
include_in_committed_dirty_box,
[&](StrokeFrame& current_frame) {
events.push_back("begin-frame:" + std::to_string(current_frame.id));
},
[&](StrokeFrame&, int face_index, std::span<const vertex_t> vertices) {
events.push_back(
"prepare:" + std::to_string(face_index) + ":" + std::to_string(vertices.size()));
},
[&](StrokeFrame&, int face_index, std::span<const vertex_t>) {
events.push_back("execute:" + std::to_string(face_index));
return glm::vec4(
static_cast<float>(face_index + 1),
static_cast<float>(face_index + 2),
static_cast<float>(face_index + 3),
static_cast<float>(face_index + 4));
},
face_framebuffers,
true);
const std::vector<std::string> expected_events {
"begin-frame:31",
"prepare:0:3",
"bind:0",
"execute:0",
"unbind:0",
"prepare:2:3",
"bind:2",
"execute:2",
"unbind:2",
};
PP_EXPECT(h, executed_faces == 2U);
PP_EXPECT(h, events == expected_events);
}
void retained_stroke_pad_executor_copies_destination_for_dirty_faces_only(pp::tests::Harness& h)
{
const std::array<bool, 3> dirty_faces { true, false, true };
@@ -1644,6 +1712,9 @@ int main()
harness.run(
"retained_stroke_dual_pass_frame_callbacks_preserve_order",
retained_stroke_dual_pass_frame_callbacks_preserve_order);
harness.run(
"retained_stroke_main_pass_frame_callbacks_preserve_order",
retained_stroke_main_pass_frame_callbacks_preserve_order);
harness.run(
"retained_stroke_live_pass_sampler_dispatch_helper_builds_expected_callback_wiring",
retained_stroke_live_pass_sampler_dispatch_helper_builds_expected_callback_wiring);