path: root/DOCS
diff options
authorwm4 <wm4@nowhere>2017-10-16 10:53:33 +0200
committerwm4 <wm4@nowhere>2017-10-16 10:57:51 +0200
commit7cfae5adceed47122ced715c8b9cda0b87a1f1bf (patch)
tree9ac9ab76a3a95f50f46729a84616250202219519 /DOCS
parentc6b97a4935cf2e5d1008e4b0d03c8cece415fec1 (diff)
vo_gpu: semi-fix --gpu-context/--gpu-api options and help output
This was confusing at best. Change it to output the actual choices. (Seems like in the end it's always me who has to clean up other people's bullshit.) Context names were not unique - but they should be, so fix it. The whole point of the original --opengl-backend option was to side-step the tricky auto-detection, so you know exactly what you get. The goal of this commit is to make --gpu-context work the same way. Fix the non-unique names by appending "vk" to the names. Keep in mind that this was not suitable for slecting the "UI" backend anyway, since "x11" would force GLX, whereas people on not-NVIDIA actually want "x11egl". Users trying to use --gpu-context=x11 to force the X11 backend would always end up with GLX, which would at least break VAAPI hardware decoding for them. Basically the idea that this option could select the "UI" type is completely broken - it selects an implementation, which implies a UI. Selecting the UI type This would require a separate mechanism. (Although in theory this separate mechanism could be part of the --gpu-context option - in any case, someone would have to implement it.) To achieve help output that can actually be understood, just duplicate the code. Most of that code is duplicated anyway, and trying to share just the list code with the result of making the output unreadable doesn't make too much sense. If we wanted to save code/effort, we could just remove the help output altogether. --gpu-api has non-unique entries, and it would be nice to group them (e.g. list all OpenGL capable contexts with "opengl"), but C makes this simple idea too much of a pain, so don't do it. Also remove a stray tab from the android entry on the manpage.
Diffstat (limited to 'DOCS')
1 files changed, 10 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7a08aec297..ee57681218 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -4626,7 +4626,9 @@ The following video options are currently all specific to ``--vo=gpu`` and
Cocoa/OS X
- Win32/WGL, VK_KHR_win32_surface
+ Win32/WGL
+ winvk
+ VK_KHR_win32_surface
Direct3D11 through the OpenGL ES translation layer ANGLE. This supports
almost everything the ``win`` backend does (if the ANGLE build is new
@@ -4636,18 +4638,22 @@ The following video options are currently all specific to ``--vo=gpu`` and
on Nvidia and AMD. Newer Intel chips with the latest drivers may also
- X11/GLX, VK_KHR_xlib_surface
+ X11/GLX
+ x11vk
+ VK_KHR_xlib_surface
For internal autoprobing, equivalent to ``x11`` otherwise. Don't use
directly, it could be removed without warning as autoprobing is changed.
- Wayland/EGL, VK_KHR_wayland_surface
+ Wayland/EGL
+ waylandvk
+ VK_KHR_wayland_surface
- Android/EGL. Requires ``--wid`` be set to an ``android.view.Surface``.
+ Android/EGL. Requires ``--wid`` be set to an ``android.view.Surface``.
Direct fbdev/EGL support on some ARM/MALI devices.