diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 3 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 3 | ||||
| -rw-r--r-- | video/out/gpu/context.c | 4 | ||||
| -rw-r--r-- | video/out/opengl/context_glx.c | 25 |
4 files changed, 3 insertions, 32 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 8ed88c1204..50cc2eb100 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -85,6 +85,9 @@ Interface changes - Remove all "tv-..." options and properties, along with the classic Linux analog TV support. - remove "program" property (no replacement) + - always prefer EGL over GLX, which helps with AMD/vaapi, but will break + vdpau with --vo=gpu - use --gpu-context=x11 to be able to use vdpau. This + does not affect --vo=vdpau or --hwdec=vdpau-copy. --- mpv 0.29.0 --- - drop --opensles-sample-rate, as --audio-samplerate should be used if desired - drop deprecated --videotoolbox-format, --ff-aid, --ff-vid, --ff-sid, diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 80a02c9d03..f35f43543f 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -4814,9 +4814,6 @@ The following video options are currently all specific to ``--vo=gpu`` and X11/GLX x11vk VK_KHR_xlib_surface - x11probe - For internal autoprobing, equivalent to ``x11`` otherwise. Don't use - directly, it could be removed without warning as autoprobing is changed. wayland Wayland/EGL waylandvk diff --git a/video/out/gpu/context.c b/video/out/gpu/context.c index 85f1aa7667..68ccf954db 100644 --- a/video/out/gpu/context.c +++ b/video/out/gpu/context.c @@ -35,7 +35,6 @@ /* OpenGL */ extern const struct ra_ctx_fns ra_ctx_glx; -extern const struct ra_ctx_fns ra_ctx_glx_probe; extern const struct ra_ctx_fns ra_ctx_x11_egl; extern const struct ra_ctx_fns ra_ctx_drm_egl; extern const struct ra_ctx_fns ra_ctx_cocoa; @@ -83,9 +82,6 @@ static const struct ra_ctx_fns *contexts[] = { #if HAVE_GL_WAYLAND &ra_ctx_wayland_egl, #endif -#if HAVE_GL_X11 - &ra_ctx_glx_probe, -#endif #if HAVE_EGL_X11 &ra_ctx_x11_egl, #endif diff --git a/video/out/opengl/context_glx.c b/video/out/opengl/context_glx.c index 7dc8062c1c..b415372e62 100644 --- a/video/out/opengl/context_glx.c +++ b/video/out/opengl/context_glx.c @@ -346,20 +346,6 @@ uninit: return false; } -static bool glx_init_probe(struct ra_ctx *ctx) -{ - if (!glx_init(ctx)) - return false; - - struct priv *p = ctx->priv; - if (!(p->gl.mpgl_caps & MPGL_CAP_VDPAU)) { - MP_VERBOSE(ctx, "No vdpau support found - probing more things.\n"); - glx_uninit(ctx); - return false; - } - - return true; -} static void resize(struct ra_ctx *ctx) { @@ -401,14 +387,3 @@ const struct ra_ctx_fns ra_ctx_glx = { .init = glx_init, .uninit = glx_uninit, }; - -const struct ra_ctx_fns ra_ctx_glx_probe = { - .type = "opengl", - .name = "x11probe", - .reconfig = glx_reconfig, - .control = glx_control, - .wakeup = glx_wakeup, - .wait_events = glx_wait_events, - .init = glx_init_probe, - .uninit = glx_uninit, -}; |