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

Extend retained stroke frame sample tests

Browse Source
This commit is contained in:
omigamedev
2026-06-13 10:58:45 +02:00
parent 3d4d0f99d1
commit f234f69502
3 changed files with 194 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
tests/paint_renderer/stroke_execution_tests.cpp
View File

@@ -301,6 +301,183 @@ struct DummyFramebuffer {
}
};
std::vector<vertex_t> make_face_triangle(float origin_x, float origin_y)
{
return {
vertex_t(glm::vec2(origin_x + 0.0F, origin_y + 0.0F)),
vertex_t(glm::vec2(origin_x + 1.0F, origin_y + 0.0F)),
vertex_t(glm::vec2(origin_x + 0.5F, origin_y + 1.0F)),
};
}
void retained_stroke_frame_samples_preserve_frame_face_callback_order(pp::tests::Harness& h)
{
std::array<StrokeFrame, 2> frames {};
frames[0].id = 11;
frames[0].shapes[1] = make_face_triangle(1.0F, 10.0F);
frames[0].shapes[4] = make_face_triangle(4.0F, 40.0F);
frames[1].id = 12;
frames[1].shapes[0] = make_face_triangle(2.0F, 20.0F);
std::vector<std::string> events;
std::vector<glm::vec4> finish_boxes;
const auto executed_faces = pp::panopainter::execute_legacy_canvas_stroke_frame_samples(
frames,
[&](StrokeFrame& frame) {
events.emplace_back("begin-frame:" + std::to_string(frame.id));
},
[&](StrokeFrame& frame, int face_index, std::span<const vertex_t> vertices) {
events.emplace_back(
"begin-face:" + std::to_string(frame.id) + ":" + std::to_string(face_index) + ":" +
std::to_string(vertices.size()));
},
[&](StrokeFrame& frame, int face_index, std::span<const vertex_t>) {
events.emplace_back("execute:" + std::to_string(frame.id) + ":" + std::to_string(face_index));
return glm::vec4(
static_cast<float>(frame.id),
static_cast<float>(face_index),
static_cast<float>(frame.id + face_index),
static_cast<float>(frame.id + face_index + 1));
},
[&](StrokeFrame& frame, int face_index, glm::vec4 sample_dirty_box) {
events.emplace_back("finish:" + std::to_string(frame.id) + ":" + std::to_string(face_index));
finish_boxes.push_back(sample_dirty_box);
});
PP_EXPECT(h, executed_faces == 3U);
const std::vector<std::string> expected_events {
"begin-frame:11",
"begin-face:11:1:3",
"execute:11:1",
"finish:11:1",
"begin-face:11:4:3",
"execute:11:4",
"finish:11:4",
"begin-frame:12",
"begin-face:12:0:3",
"execute:12:0",
"finish:12:0",
};
PP_EXPECT(h, events == expected_events);
PP_EXPECT(h, finish_boxes.size() == 3U);
PP_EXPECT(h, nearly_equal(finish_boxes[0].x, 11.0F));
PP_EXPECT(h, nearly_equal(finish_boxes[0].y, 1.0F));
PP_EXPECT(h, nearly_equal(finish_boxes[1].x, 11.0F));
PP_EXPECT(h, nearly_equal(finish_boxes[1].y, 4.0F));
PP_EXPECT(h, nearly_equal(finish_boxes[2].x, 12.0F));
PP_EXPECT(h, nearly_equal(finish_boxes[2].y, 0.0F));
}
void retained_stroke_frame_samples_with_dirty_tracking_updates_after_finish(pp::tests::Harness& h)
{
std::array<StrokeFrame, 2> frames {};
frames[0].id = 21;
frames[0].shapes[1] = make_face_triangle(2.0F, 6.0F);
frames[1].id = 22;
frames[1].shapes[4] = make_face_triangle(8.0F, 12.0F);
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));
accumulated_dirty_boxes[1] = glm::vec4(10.0F, 10.0F, 14.0F, 14.0F);
pass_dirty_boxes[1] = glm::vec4(20.0F, 20.0F, 21.0F, 21.0F);
accumulated_dirty_boxes[4] = glm::vec4(40.0F, 40.0F, 44.0F, 44.0F);
pass_dirty_boxes[4] = glm::vec4(50.0F, 50.0F, 51.0F, 51.0F);
std::array<bool, 6> include_in_committed_dirty_box { true, false, true, true, true, true };
std::array<bool, 6> committed_dirty_faces {};
std::array<bool, 6> pass_dirty_faces {};
std::vector<std::string> events;
std::vector<glm::vec4> finish_seen_accumulated;
std::vector<glm::vec4> finish_seen_pass;
const auto executed_faces = pp::panopainter::execute_legacy_canvas_stroke_frame_samples_with_dirty_tracking(
frames,
pp::renderer::Extent2D { .width = 64, .height = 64 },
accumulated_dirty_boxes,
pass_dirty_boxes,
include_in_committed_dirty_box,
[&](StrokeFrame& frame) {
events.emplace_back("begin-frame:" + std::to_string(frame.id));
},
[&](StrokeFrame& frame, int face_index, std::span<const vertex_t>) {
events.emplace_back("begin-face:" + std::to_string(frame.id) + ":" + std::to_string(face_index));
},
[&](StrokeFrame& frame, int face_index, std::span<const vertex_t>) {
events.emplace_back("execute:" + std::to_string(frame.id) + ":" + std::to_string(face_index));
if (face_index == 1) {
return glm::vec4(1.0F, 2.0F, 5.0F, 6.0F);
}
return glm::vec4(7.0F, 8.0F, 9.0F, 10.0F);
},
[&](StrokeFrame& frame, int face_index, std::span<const vertex_t>, auto& request) {
events.emplace_back("prepare:" + std::to_string(frame.id) + ":" + std::to_string(face_index));
if (face_index == 4) {
request.previous_pass_dirty_box = request.sample_dirty_box;
}
},
[&](StrokeFrame& frame, int face_index, std::span<const vertex_t>, glm::vec4 sample_dirty_box) {
events.emplace_back("finish:" + std::to_string(frame.id) + ":" + std::to_string(face_index));
finish_seen_accumulated.push_back(accumulated_dirty_boxes[face_index]);
finish_seen_pass.push_back(pass_dirty_boxes[face_index]);
if (face_index == 1) {
PP_EXPECT(h, nearly_equal(sample_dirty_box.x, 1.0F));
PP_EXPECT(h, nearly_equal(sample_dirty_box.w, 6.0F));
} else {
PP_EXPECT(h, nearly_equal(sample_dirty_box.x, 7.0F));
PP_EXPECT(h, nearly_equal(sample_dirty_box.w, 10.0F));
}
},
committed_dirty_faces,
pass_dirty_faces);
PP_EXPECT(h, executed_faces == 2U);
const std::vector<std::string> expected_events {
"begin-frame:21",
"begin-face:21:1",
"execute:21:1",
"prepare:21:1",
"finish:21:1",
"begin-frame:22",
"begin-face:22:4",
"execute:22:4",
"prepare:22:4",
"finish:22:4",
};
PP_EXPECT(h, events == expected_events);
PP_EXPECT(h, finish_seen_accumulated.size() == 2U);
PP_EXPECT(h, nearly_equal(finish_seen_accumulated[0].x, 10.0F));
PP_EXPECT(h, nearly_equal(finish_seen_accumulated[0].w, 14.0F));
PP_EXPECT(h, nearly_equal(finish_seen_pass[0].x, 20.0F));
PP_EXPECT(h, nearly_equal(finish_seen_pass[0].w, 21.0F));
PP_EXPECT(h, nearly_equal(finish_seen_accumulated[1].x, 40.0F));
PP_EXPECT(h, nearly_equal(finish_seen_accumulated[1].w, 44.0F));
PP_EXPECT(h, nearly_equal(finish_seen_pass[1].x, 50.0F));
PP_EXPECT(h, nearly_equal(finish_seen_pass[1].w, 51.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[1].x, 10.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[1].y, 10.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[1].z, 14.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[1].w, 14.0F));
PP_EXPECT(h, !committed_dirty_faces[1]);
PP_EXPECT(h, pass_dirty_faces[1]);
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[1].x, 1.0F));
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[1].y, 2.0F));
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[1].z, 21.0F));
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[1].w, 21.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[4].x, 7.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[4].y, 8.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[4].z, 44.0F));
PP_EXPECT(h, nearly_equal(accumulated_dirty_boxes[4].w, 44.0F));
PP_EXPECT(h, committed_dirty_faces[4]);
PP_EXPECT(h, pass_dirty_faces[4]);
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[4].x, 7.0F));
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[4].y, 8.0F));
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[4].z, 9.0F));
PP_EXPECT(h, nearly_equal(pass_dirty_boxes[4].w, 10.0F));
}
void retained_stroke_live_pass_with_face_framebuffers_preserves_order_and_dirty_tracking(pp::tests::Harness& h)
{
StrokeFrame frame;
@@ -627,6 +804,12 @@ int main()
harness.run(
"retained_stroke_sample_executor_unbinds_and_skips_draw_when_bounds_are_empty",
retained_stroke_sample_executor_unbinds_and_skips_draw_when_bounds_are_empty);
harness.run(
"retained_stroke_frame_samples_preserve_frame_face_callback_order",
retained_stroke_frame_samples_preserve_frame_face_callback_order);
harness.run(
"retained_stroke_frame_samples_with_dirty_tracking_updates_after_finish",
retained_stroke_frame_samples_with_dirty_tracking_updates_after_finish);
harness.run(
"retained_stroke_live_pass_with_face_framebuffers_preserves_order_and_dirty_tracking",
retained_stroke_live_pass_with_face_framebuffers_preserves_order_and_dirty_tracking);