summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9e23383)
raw | patch | inline | side by side (parent: 9e23383)
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Fri, 27 May 2016 11:28:56 +0000 (14:28 +0300) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Mon, 30 May 2016 10:52:34 +0000 (13:52 +0300) |
utils/testpat.cpp | patch | blob | history |
diff --git a/utils/testpat.cpp b/utils/testpat.cpp
index cb2fe4124da8d9d3f8200fc6f886ff04714c2d80..0dc7c1735a7de2ba93e4e36fe8ceb8f8984ebe28 100644 (file)
--- a/utils/testpat.cpp
+++ b/utils/testpat.cpp
@@ -245,9 +245,7 @@ static void parse_plane(Card& card, const string& plane_str, const OutputInfo& o
static DumbFramebuffer* get_default_fb(Card& card, unsigned width, unsigned height)
{
- auto fb = new DumbFramebuffer(card, width, height, PixelFormat::XRGB8888);
- draw_test_pattern(*fb);
- return fb;
+ return new DumbFramebuffer(card, width, height, PixelFormat::XRGB8888);
}
static DumbFramebuffer* parse_fb(Card& card, const string& fb_str, unsigned def_w, unsigned def_h)
@@ -273,9 +271,7 @@ static DumbFramebuffer* parse_fb(Card& card, const string& fb_str, unsigned def_
format = FourCCToPixelFormat(sm[3]);
}
- auto fb = new DumbFramebuffer(card, w, h, format);
- draw_test_pattern(*fb);
- return fb;
+ return new DumbFramebuffer(card, w, h, format);
}
static const char* usage_str =
}
}
+static void draw_test_patterns(const vector<OutputInfo>& outputs)
+{
+ for (const OutputInfo& o : outputs) {
+ if (o.fb)
+ draw_test_pattern(*o.fb);
+
+ for (const PlaneInfo& p : o.planes)
+ draw_test_pattern(*p.fb);
+ }
+}
+
static void set_crtcs_n_planes(Card& card, const vector<OutputInfo>& outputs)
{
for (const OutputInfo& o : outputs) {
vector<OutputInfo> outputs = setups_to_outputs(card, output_args);
+ draw_test_patterns(outputs);
+
print_outputs(outputs);
set_crtcs_n_planes(card, outputs);