diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2017-02-10 07:33:55 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2017-02-10 10:55:12 +0200 |
commit | 38b625b629a48e8cf070a749111a641d45394634 (patch) | |
tree | c9a42185d1e89caabacf39ff853bc0c04346e965 /kms++ | |
parent | d47d70dcf4bdb2ae34ec27ba65db5bfdcb64b480 (diff) |
ExtFb: pass params in vectors
Diffstat (limited to 'kms++')
-rw-r--r-- | kms++/inc/kms++/extframebuffer.h | 4 | ||||
-rw-r--r-- | kms++/src/extframebuffer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kms++/inc/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h index 89551c3..cee82d3 100644 --- a/kms++/inc/kms++/extframebuffer.h +++ b/kms++/inc/kms++/extframebuffer.h @@ -10,9 +10,9 @@ class ExtFramebuffer : public MappedFramebuffer { public: ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - uint32_t handles[4], uint32_t pitches[4], uint32_t offsets[4]); + std::vector<uint32_t> handles, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets); ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - int fds[4], uint32_t pitches[4], uint32_t offsets[4]); + std::vector<int> fds, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets); virtual ~ExtFramebuffer(); uint32_t width() const { return Framebuffer::width(); } diff --git a/kms++/src/extframebuffer.cpp b/kms++/src/extframebuffer.cpp index 2f23a33..51f3611 100644 --- a/kms++/src/extframebuffer.cpp +++ b/kms++/src/extframebuffer.cpp @@ -13,7 +13,7 @@ namespace kms { ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - uint32_t handles[], uint32_t pitches[], uint32_t offsets[]) + vector<uint32_t> handles, vector<uint32_t> pitches, vector<uint32_t> offsets) : MappedFramebuffer(card, width, height) { m_format = format; @@ -35,7 +35,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe } uint32_t id; - int r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, handles, pitches, offsets, &id, 0); + int r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, handles.data(), pitches.data(), offsets.data(), &id, 0); if (r) throw std::invalid_argument(string("Failed to create ExtFramebuffer: ") + strerror(r)); @@ -43,7 +43,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe } ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - int fds[4], uint32_t pitches[4], uint32_t offsets[4]) + vector<int> fds, vector<uint32_t> pitches, vector<uint32_t> offsets) : MappedFramebuffer(card, width, height) { int r; @@ -72,7 +72,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe uint32_t id; uint32_t bo_handles[4] = { m_planes[0].handle, m_planes[1].handle }; r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, - bo_handles, pitches, offsets, &id, 0); + bo_handles, pitches.data(), offsets.data(), &id, 0); if (r) throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno)); |