diff options
author | Niklas Haas <git@haasn.xyz> | 2017-09-14 08:04:55 +0200 |
---|---|---|
committer | Niklas Haas <git@haasn.xyz> | 2017-09-21 15:00:55 +0200 |
commit | 65979986a923a8f08019b257c3fe72cd5e8ecf68 (patch) | |
tree | b8f4b8c17d583594aef0ca509064f8b2ff7128d4 /etc | |
parent | 20f958c9775652c3213588c2a0824f5353276adc (diff) | |
download | mpv-65979986a923a8f08019b257c3fe72cd5e8ecf68.tar.bz2 mpv-65979986a923a8f08019b257c3fe72cd5e8ecf68.tar.xz |
vo_opengl: refactor into vo_gpu
This is done in several steps:
1. refactor MPGLContext -> struct ra_ctx
2. move GL-specific stuff in vo_opengl into opengl/context.c
3. generalize context creation to support other APIs, and add --gpu-api
4. rename all of the --opengl- options that are no longer opengl-specific
5. move all of the stuff from opengl/* that isn't GL-specific into gpu/
(note: opengl/gl_utils.h became opengl/utils.h)
6. rename vo_opengl to vo_gpu
7. to handle window screenshots, the short-term approach was to just add
it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to
ra itself (and vo_gpu altered to compensate), but this was a stop-gap
measure to prevent this commit from getting too big
8. move ra->fns->flush to ra_gl_ctx instead
9. some other minor changes that I've probably already forgotten
Note: This is one half of a major refactor, the other half of which is
provided by rossy's following commit. This commit enables support for
all linux platforms, while his version enables support for all non-linux
platforms.
Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the
--opengl- options like --opengl-early-flush, --opengl-finish etc. Should
be a strict superset of the old functionality.
Disclaimer: Since I have no way of compiling mpv on all platforms, some
of these ports were done blindly. Specifically, the blind ports included
context_mali_fbdev.c and context_rpi.c. Since they're both based on
egl_helpers, the port should have gone smoothly without any major
changes required. But if somebody complains about a compile error on
those platforms (assuming anybody actually uses them), you know where to
complain.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/builtin.conf | 6 | ||||
-rw-r--r-- | etc/mpv.conf | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/etc/builtin.conf b/etc/builtin.conf index 1d93df9606..ee46f8cb00 100644 --- a/etc/builtin.conf +++ b/etc/builtin.conf @@ -36,7 +36,7 @@ load-scripts=no osc=no framedrop=no -[opengl-hq] +[gpu-hq] scale=spline36 cscale=spline36 dscale=mitchell @@ -44,3 +44,7 @@ dither-depth=auto correct-downscaling=yes sigmoid-upscaling=yes deband=yes + +# Compatibility alias (deprecated) +[opengl-hq] +profile=gpu-hq diff --git a/etc/mpv.conf b/etc/mpv.conf index d72c9ee6d7..2a8f8b9f8b 100644 --- a/etc/mpv.conf +++ b/etc/mpv.conf @@ -52,9 +52,9 @@ # Keep the player window on top of all other windows. #ontop=yes -# Specify high quality video rendering preset (for OpenGL VO only) +# Specify high quality video rendering preset (for --vo=gpu only) # Can cause performance problems with some drivers and GPUs. -#profile=opengl-hq +#profile=gpu-hq # Force video to lock on the display's refresh rate, and change video and audio # speed to some degree to ensure synchronous playback - can cause problems |