From 825a7061397e90f3e42e71e59565dd68f9423837 Mon Sep 17 00:00:00 2001 From: loki Date: Sun, 6 Jun 2021 17:19:30 +0200 Subject: [PATCH] Remove build dependency for gbm --- CMakeLists.txt | 1 - sunshine/platform/linux/vaapi.cpp | 94 +++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46793ca5..3930857f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,6 @@ else() glad/include/glad/egl.h) set(GRAPHICS_LIBRARIES - gbm dl va va-drm) diff --git a/sunshine/platform/linux/vaapi.cpp b/sunshine/platform/linux/vaapi.cpp index cb295188..f49cf803 100644 --- a/sunshine/platform/linux/vaapi.cpp +++ b/sunshine/platform/linux/vaapi.cpp @@ -1,10 +1,11 @@ +#include #include #include #include +#include #include -#include #include #include @@ -39,10 +40,89 @@ extern "C" { using namespace std::literals; +namespace dyn { +void *handle(const std::vector &libs) { + void *handle; + + for(auto lib : libs) { + handle = dlopen(lib, RTLD_LAZY | RTLD_LOCAL); + if(handle) { + return handle; + } + } + + std::stringstream ss; + ss << "Couldn't find any of the following libraries: ["sv << libs.front(); + std::for_each(std::begin(libs) + 1, std::end(libs), [&](auto lib) { + ss << ", "sv << lib; + }); + + ss << ']'; + + BOOST_LOG(error) << ss.str(); + + return nullptr; +} + +int load(void *handle, std::vector> &funcs, bool strict = true) { + for(auto &func : funcs) { + TUPLE_2D_REF(fn, name, func); + + *fn = GLAD_GNUC_EXTENSION(GLADapiproc) dlsym(handle, name); + + if(!fn && strict) { + BOOST_LOG(error) << "Couldn't find function: "sv << name; + + return -1; + } + } + + return 0; +} +} // namespace dyn + + namespace va { using display_t = util::safe_ptr_v2; } +namespace gbm { +struct device; +typedef void (*device_destroy_fn)(device *gbm); +typedef device *(*create_device_fn)(int fd); + +device_destroy_fn device_destroy; +create_device_fn create_device; + + +int init() { + static void *handle { nullptr }; + static bool funcs_loaded = false; + + if(funcs_loaded) return 0; + + if(!handle) { + handle = dyn::handle({ "libgbm.so.1", "libgbm.so" }); + if(!handle) { + return -1; + } + } + + std::vector> funcs { + { (GLADapiproc *)&device_destroy, "gbm_device_destroy" }, + { (GLADapiproc *)&create_device, "gbm_create_device" }, + }; + + if(dyn::load(handle, funcs)) { + return -1; + } + + funcs_loaded = true; + return 0; +} + +} // namespace gbm + namespace gl { static GladGLContext ctx; @@ -79,7 +159,6 @@ public: gl::ctx.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); // y gl::ctx.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); gl::ctx.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - gl::ctx.TexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); gl::ctx.TexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, color); } @@ -356,7 +435,7 @@ constexpr auto EGL_DMA_BUF_PLANE0_OFFSET_EXT = 0x3273; constexpr auto EGL_DMA_BUF_PLANE0_PITCH_EXT = 0x3274; using display_t = util::dyn_safe_ptr_v2; -using gbm_t = util::safe_ptr; +using gbm_t = util::dyn_safe_ptr; int vaapi_make_hwdevice_ctx(platf::hwdevice_t *base, AVBufferRef **hw_device_buf); @@ -413,7 +492,7 @@ public: &prime); if(status) { - BOOST_LOG(error) << "Couldn't export va surface handle: "sv << vaErrorStr(status); + BOOST_LOG(error) << "Couldn't export va surface handle: ["sv << (int)surface << "]: "sv << vaErrorStr(status); return std::nullopt; } @@ -495,6 +574,10 @@ public: } int init(int in_width, int in_height, const char *render_device) { + if(gbm::init()) { + return -1; + } + file.el = open(render_device, O_RDWR); if(file.el < 0) { @@ -503,7 +586,7 @@ public: return -1; } - gbm.reset(gbm_create_device(file.el)); + gbm.reset(gbm::create_device(file.el)); if(!gbm) { BOOST_LOG(error) << "Couldn't create GBM device: ["sv << util::hex(eglGetError()).to_string_view() << ']'; return -1; @@ -672,7 +755,6 @@ public: int convert(platf::img_t &img) override { auto tex = tex_in[0]; - gl::ctx.ActiveTexture(GL_TEXTURE0); gl::ctx.BindTexture(GL_TEXTURE_2D, tex); gl::ctx.TexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, in_width, in_height, GL_BGRA, GL_UNSIGNED_BYTE, img.data);