aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen2017-02-09 23:33:55 -0600
committerTomi Valkeinen2017-02-10 02:55:12 -0600
commit38b625b629a48e8cf070a749111a641d45394634 (patch)
treec9a42185d1e89caabacf39ff853bc0c04346e965
parentd47d70dcf4bdb2ae34ec27ba65db5bfdcb64b480 (diff)
downloadexternal-libkmsxx-38b625b629a48e8cf070a749111a641d45394634.tar.gz
external-libkmsxx-38b625b629a48e8cf070a749111a641d45394634.tar.xz
external-libkmsxx-38b625b629a48e8cf070a749111a641d45394634.zip
ExtFb: pass params in vectors
-rw-r--r--kms++/inc/kms++/extframebuffer.h4
-rw-r--r--kms++/src/extframebuffer.cpp8
-rw-r--r--kmscube/cube-gbm.cpp6
-rw-r--r--utils/kmscapture.cpp6
4 files changed, 12 insertions, 12 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
10{ 10{
11public: 11public:
12 ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, 12 ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
13 uint32_t handles[4], uint32_t pitches[4], uint32_t offsets[4]); 13 std::vector<uint32_t> handles, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets);
14 ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, 14 ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
15 int fds[4], uint32_t pitches[4], uint32_t offsets[4]); 15 std::vector<int> fds, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets);
16 virtual ~ExtFramebuffer(); 16 virtual ~ExtFramebuffer();
17 17
18 uint32_t width() const { return Framebuffer::width(); } 18 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
13{ 13{
14 14
15ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, 15ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
16 uint32_t handles[], uint32_t pitches[], uint32_t offsets[]) 16 vector<uint32_t> handles, vector<uint32_t> pitches, vector<uint32_t> offsets)
17 : MappedFramebuffer(card, width, height) 17 : MappedFramebuffer(card, width, height)
18{ 18{
19 m_format = format; 19 m_format = format;
@@ -35,7 +35,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe
35 } 35 }
36 36
37 uint32_t id; 37 uint32_t id;
38 int r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, handles, pitches, offsets, &id, 0); 38 int r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, handles.data(), pitches.data(), offsets.data(), &id, 0);
39 if (r) 39 if (r)
40 throw std::invalid_argument(string("Failed to create ExtFramebuffer: ") + strerror(r)); 40 throw std::invalid_argument(string("Failed to create ExtFramebuffer: ") + strerror(r));
41 41
@@ -43,7 +43,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe
43} 43}
44 44
45ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, 45ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
46 int fds[4], uint32_t pitches[4], uint32_t offsets[4]) 46 vector<int> fds, vector<uint32_t> pitches, vector<uint32_t> offsets)
47 : MappedFramebuffer(card, width, height) 47 : MappedFramebuffer(card, width, height)
48{ 48{
49 int r; 49 int r;
@@ -72,7 +72,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe
72 uint32_t id; 72 uint32_t id;
73 uint32_t bo_handles[4] = { m_planes[0].handle, m_planes[1].handle }; 73 uint32_t bo_handles[4] = { m_planes[0].handle, m_planes[1].handle };
74 r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, 74 r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format,
75 bo_handles, pitches, offsets, &id, 0); 75 bo_handles, pitches.data(), offsets.data(), &id, 0);
76 if (r) 76 if (r)
77 throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno)); 77 throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno));
78 78
diff --git a/kmscube/cube-gbm.cpp b/kmscube/cube-gbm.cpp
index 993434b..07413ab 100644
--- a/kmscube/cube-gbm.cpp
+++ b/kmscube/cube-gbm.cpp
@@ -134,9 +134,9 @@ public:
134 uint32_t handle = gbm_bo_get_handle(bo).u32; 134 uint32_t handle = gbm_bo_get_handle(bo).u32;
135 PixelFormat format = (PixelFormat)gbm_bo_get_format(bo); 135 PixelFormat format = (PixelFormat)gbm_bo_get_format(bo);
136 136
137 uint32_t handles[4] { handle }; 137 vector<uint32_t> handles { handle };
138 uint32_t strides[4] { stride }; 138 vector<uint32_t> strides { stride };
139 uint32_t offsets[4] { 0 }; 139 vector<uint32_t> offsets { 0 };
140 140
141 fb = new ExtFramebuffer(card, width, height, format, handles, strides, offsets); 141 fb = new ExtFramebuffer(card, width, height, format, handles, strides, offsets);
142 142
diff --git a/utils/kmscapture.cpp b/utils/kmscapture.cpp
index b4c3e88..43ef989 100644
--- a/utils/kmscapture.cpp
+++ b/utils/kmscapture.cpp
@@ -83,9 +83,9 @@ ExtFramebuffer* CameraPipeline::GetExtFrameBuffer(Card& card, uint32_t i, PixelF
83 const PixelFormatInfo& format_info = get_pixel_format_info(pixfmt); 83 const PixelFormatInfo& format_info = get_pixel_format_info(pixfmt);
84 ASSERT(format_info.num_planes == 1); 84 ASSERT(format_info.num_planes == 1);
85 85
86 uint32_t handles[4] { handle }; 86 vector<uint32_t> handles { handle };
87 uint32_t pitches[4] { m_in_width * (format_info.planes[0].bitspp / 8) }; 87 vector<uint32_t> pitches { m_in_width * (format_info.planes[0].bitspp / 8) };
88 uint32_t offsets[4] { }; 88 vector<uint32_t> offsets { };
89 89
90 return new ExtFramebuffer(card, m_in_width, m_in_height, pixfmt, 90 return new ExtFramebuffer(card, m_in_width, m_in_height, pixfmt,
91 handles, pitches, offsets); 91 handles, pitches, offsets);