summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 27856a7)
raw | patch | inline | side by side (parent: 27856a7)
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Fri, 23 Sep 2016 12:33:56 +0000 (15:33 +0300) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Mon, 21 Nov 2016 16:20:46 +0000 (18:20 +0200) |
Use MappedFramebuffer instead of DumbFramebuffer in kmstest, except when
creating the object. This change makes it possible to easily use other
framebuffer objects in kmstest than DumbFramebuffer.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
creating the object. This change makes it possible to easily use other
framebuffer objects in kmstest than DumbFramebuffer.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
utils/kmstest.cpp | patch | blob | history |
diff --git a/utils/kmstest.cpp b/utils/kmstest.cpp
index cfec7804bc2184ba88e5c8ff7607ea7de945605f..43cb55741510da40dc4f7231eef53faf15bdeaed 100644 (file)
--- a/utils/kmstest.cpp
+++ b/utils/kmstest.cpp
unsigned w;
unsigned h;
- vector<DumbFramebuffer*> fbs;
+ vector<MappedFramebuffer*> fbs;
};
struct OutputInfo
Plane* primary_plane;
Videomode mode;
bool user_set_crtc;
- vector<DumbFramebuffer*> fbs;
+ vector<MappedFramebuffer*> fbs;
vector<PlaneInfo> planes;
};
@@ -288,9 +288,9 @@ static void parse_plane(Card& card, const string& plane_str, const OutputInfo& o
pinfo.y = output.mode.vdisplay / 2 - pinfo.h / 2;
}
-static vector<DumbFramebuffer*> get_default_fb(Card& card, unsigned width, unsigned height)
+static vector<MappedFramebuffer*> get_default_fb(Card& card, unsigned width, unsigned height)
{
- vector<DumbFramebuffer*> v;
+ vector<MappedFramebuffer*> v;
for (unsigned i = 0; i < s_num_buffers; ++i)
v.push_back(new DumbFramebuffer(card, width, height, PixelFormat::XRGB8888));
@@ -298,7 +298,7 @@ static vector<DumbFramebuffer*> get_default_fb(Card& card, unsigned width, unsig
return v;
}
-static vector<DumbFramebuffer*> parse_fb(Card& card, const string& fb_str, unsigned def_w, unsigned def_h)
+static vector<MappedFramebuffer*> parse_fb(Card& card, const string& fb_str, unsigned def_w, unsigned def_h)
{
unsigned w = def_w;
unsigned h = def_h;
@@ -323,7 +323,7 @@ static vector<DumbFramebuffer*> parse_fb(Card& card, const string& fb_str, unsig
format = FourCCToPixelFormat(sm[3]);
}
- vector<DumbFramebuffer*> v;
+ vector<MappedFramebuffer*> v;
for (unsigned i = 0; i < s_num_buffers; ++i)
v.push_back(new DumbFramebuffer(card, w, h, format));
queue_next();
}
- static unsigned get_bar_pos(DumbFramebuffer* fb, unsigned frame_num)
+ static unsigned get_bar_pos(MappedFramebuffer* fb, unsigned frame_num)
{
return (frame_num * bar_speed) % (fb->width() - bar_width + 1);
}
- static void draw_bar(DumbFramebuffer* fb, unsigned frame_num)
+ static void draw_bar(MappedFramebuffer* fb, unsigned frame_num)
{
int old_xpos = frame_num < s_num_buffers ? -1 : get_bar_pos(fb, frame_num - s_num_buffers);
int new_xpos = get_bar_pos(fb, frame_num);