izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix file descriptor leak

Browse Source
This commit is contained in:
loki
2021-06-06 20:57:42 +02:00
parent 7f636a25a8
commit 84c55d6efc
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/sunshine.conf
View File

@@ -247,4 +247,5 @@
# To set the initial state of flags -0 and -1 to on, set the following flags: # To set the initial state of flags -0 and -1 to on, set the following flags:
# flags = 01 # flags = 01
# #
# See: sunshine --help for all options under the header: flags # See: sunshine --help for all options under the header: flags
adapter_name=/dev/dri/renderD129

14
sunshine/platform/linux/vaapi.cpp
View File

@@ -581,6 +581,11 @@ struct nv12_img_t {
gl::tex_t tex; gl::tex_t tex;
gl::frame_buf_t buf; gl::frame_buf_t buf;
static constexpr std::size_t num_fds =
sizeof(va::DRMPRIMESurfaceDescriptor::objects) / sizeof(va::DRMPRIMESurfaceDescriptor::objects[0]);
std::array<file_t, num_fds> fds;
}; };
KITTY_USING_MOVE_T(nv12_t, nv12_img_t, , { KITTY_USING_MOVE_T(nv12_t, nv12_img_t, , {
@@ -626,6 +631,12 @@ public:
return std::nullopt; return std::nullopt;
} }
// Keep track of file descriptors
std::array<file_t, nv12_img_t::num_fds> fds;
for(int x = 0; x < prime.num_objects; ++x) {
fds[x] = prime.objects[x].fd;
}
int img_attr_planes[2][13] { int img_attr_planes[2][13] {
{ EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_R8, { EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_R8,
EGL_WIDTH, (int)prime.width, EGL_WIDTH, (int)prime.width,
@@ -649,7 +660,8 @@ public:
eglCreateImageKHR(display.get(), EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, img_attr_planes[0]), eglCreateImageKHR(display.get(), EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, img_attr_planes[0]),
eglCreateImageKHR(display.get(), EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, img_attr_planes[1]), eglCreateImageKHR(display.get(), EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, img_attr_planes[1]),
gl::tex_t::make(2), gl::tex_t::make(2),
gl::frame_buf_t::make(2) gl::frame_buf_t::make(2),
std::move(fds)
}; };
if(!nv12->r8 || !nv12->bg88) { if(!nv12->r8 || !nv12->bg88) {

2
sunshine/utility.h
View File

@@ -33,7 +33,7 @@ struct argument_type<T(U)> { typedef U type; };
move_t(Args &&...args) : el { std::forward<Args>(args)... } {} \ move_t(Args &&...args) : el { std::forward<Args>(args)... } {} \
move_t(const move_t &) = delete; \ move_t(const move_t &) = delete; \
\ \
explicit move_t(move_t &&other) : el { std::move(other.el) } { \ move_t(move_t &&other) noexcept : el { std::move(other.el) } { \
other.el = element_type { init_val }; \ other.el = element_type { init_val }; \
} \ } \
\ \