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

Use standard function for create egl images

Browse Source
This commit is contained in:
loki
2021-08-15 22:19:08 +02:00
parent d852bb82a3
commit 1d2e042240
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunshine/platform/linux/graphics.cpp
+3 -3
View File
@@ -410,7 +410,7 @@ std::optional<rgb_t> import_source(display_t::pointer egl_display, const surface
} }
std::optional<nv12_t> import_target(display_t::pointer egl_display, std::array<file_t, nv12_img_t::num_fds> &&fds, const surface_descriptor_t &r8, const surface_descriptor_t &gr88) { std::optional<nv12_t> import_target(display_t::pointer egl_display, std::array<file_t, nv12_img_t::num_fds> &&fds, const surface_descriptor_t &r8, const surface_descriptor_t &gr88) {
int img_attr_planes[2][13] { EGLAttrib img_attr_planes[2][13] {
{ EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_R8, { EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_R8,
EGL_WIDTH, r8.width, EGL_WIDTH, r8.width,
EGL_HEIGHT, r8.height, EGL_HEIGHT, r8.height,
@@ -430,8 +430,8 @@ std::optional<nv12_t> import_target(display_t::pointer egl_display, std::array<f
nv12_t nv12 { nv12_t nv12 {
egl_display, egl_display,
eglCreateImageKHR(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, img_attr_planes[0]), eglCreateImage(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, img_attr_planes[0]),
eglCreateImageKHR(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, img_attr_planes[1]), eglCreateImage(egl_display, 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) std::move(fds)
sunshine/platform/linux/graphics.h
+2 -2
View File
@@ -184,11 +184,11 @@ KITTY_USING_MOVE_T(rgb_t, rgb_img_t, , {
KITTY_USING_MOVE_T(nv12_t, nv12_img_t, , { KITTY_USING_MOVE_T(nv12_t, nv12_img_t, , {
if(el.r8) { if(el.r8) {
eglDestroyImageKHR(el.display, el.r8); eglDestroyImage(el.display, el.r8);
} }
if(el.bg88) { if(el.bg88) {
eglDestroyImageKHR(el.display, el.bg88); eglDestroyImage(el.display, el.bg88);
} }
}); });