diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-01-04 21:34:26 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-01-21 17:08:29 +0000 |
| commit | 92a6f2d687e90452c9080a2e0b471ced7557518f (patch) | |
| tree | 0676341e88224c4e670e7ed0f3904b04e204b8bd /options/options.c | |
| parent | 8c617765fe88a5d5597fb58d4b593161049de710 (diff) | |
| download | mpv-92a6f2d687e90452c9080a2e0b471ced7557518f.tar.bz2 mpv-92a6f2d687e90452c9080a2e0b471ced7557518f.tar.xz | |
drm: rewrite based around vo_drm_state
A longstanding pain point of the drm VOs is the relative lack of state
sharing. While drm_common does provide some sharing, it's far less than
other platforms like x11 or wayland. What we do here is essentially copy
them by creating a new vo_drm_state struct and using it in vo_drm and
context_drm_egl. Much of the functionality that was essentially
duplicated in both VOs/contexts is now reduced simple functions in
drm_common. The usage of the term 'kms' was also mostly eliminated since
this is libdrm nowadays from a userspace perspective.
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/options/options.c b/options/options.c index b4cccd3348..dbd2a3f9bd 100644 --- a/options/options.c +++ b/options/options.c @@ -48,10 +48,6 @@ #include "stream/stream.h" #include "demux/demux.h" -#if HAVE_DRM -#include "video/out/drm_common.h" -#endif - static void print_version(struct mp_log *log) { mp_print_version(log, true); @@ -187,9 +183,6 @@ static const m_option_t mp_vo_opt_list[] = { #if HAVE_WIN32_DESKTOP {"vo-mmcss-profile", OPT_STRING(mmcss_profile)}, #endif -#if HAVE_DRM - {"", OPT_SUBSTRUCT(drm_opts, drm_conf)}, -#endif #if HAVE_EGL_ANDROID {"android-surface-size", OPT_SIZE_BOX(android_surface_size)}, #endif @@ -829,6 +822,10 @@ static const m_option_t mp_opts[] = { {"", OPT_SUBSTRUCT(macos_opts, macos_conf)}, #endif +#if HAVE_DRM + {"", OPT_SUBSTRUCT(drm_opts, drm_conf)}, +#endif + #if HAVE_WAYLAND {"", OPT_SUBSTRUCT(wayland_opts, wayland_conf)}, #endif |