diff options
| author | wm4 <wm4@nowhere> | 2015-11-21 17:33:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-11-21 18:17:14 +0100 |
| commit | d5df90a295904e05a7bc26db31e8334b6c5c0e6e (patch) | |
| tree | d2a1eeb922c8e92180710e0fe2ba37163f59b6f6 /video/out/opengl/common.c | |
| parent | 3245b7f275ba9bd59583bb05474619cf2817ecc2 (diff) | |
| download | mpv-d5df90a295904e05a7bc26db31e8334b6c5c0e6e.tar.bz2 mpv-d5df90a295904e05a7bc26db31e8334b6c5c0e6e.tar.xz | |
vo_opengl: use ANGLE by default if available (except for "hq" preset)
Running mpv with default config will now pick up ANGLE by default. Since
some think ANGLE is still not good enough for hq features, extend the
"es" option to reject GLES backends, and add to to the opengl-hq preset.
One consequence is that mpv will by default use libswscale to convert
10 bit video to 8 bit, before it reaches the VO.
Diffstat (limited to 'video/out/opengl/common.c')
| -rw-r--r-- | video/out/opengl/common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c index 21e749b9f3..ae4384ec30 100644 --- a/video/out/opengl/common.c +++ b/video/out/opengl/common.c @@ -535,12 +535,12 @@ static const struct mpgl_driver *const backends[] = { #if HAVE_GL_COCOA &mpgl_driver_cocoa, #endif -#if HAVE_GL_WIN32 - &mpgl_driver_w32, -#endif #if HAVE_EGL_ANGLE &mpgl_driver_angle, #endif +#if HAVE_GL_WIN32 + &mpgl_driver_w32, +#endif #if HAVE_GL_WAYLAND &mpgl_driver_wayland, #endif @@ -630,8 +630,8 @@ static MPGLContext *init_backend(struct vo *vo, const struct mpgl_driver *driver if (!ctx->gl->version && !ctx->gl->es) goto cleanup; - if (ctx->gl->es && vo->probing) { - MP_INFO(ctx->vo, "Skipping experimental GLES support (use --vo=opengl).\n"); + if (probing && ctx->gl->es && (vo_flags & VOFLAG_NO_GLES)) { + MP_VERBOSE(ctx->vo, "Skipping GLES backend.\n"); goto cleanup; } |