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/vo_opengl.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/vo_opengl.c')
| -rw-r--r-- | video/out/vo_opengl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 1147aba79a..eb057d139f 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -397,8 +397,10 @@ static int preinit(struct vo *vo) if (p->use_gl_debug) vo_flags |= VOFLAG_GL_DEBUG; - if (p->es) + if (p->es == 1) vo_flags |= VOFLAG_GLES; + if (p->es == -1) + vo_flags |= VOFLAG_NO_GLES; if (p->allow_sw) vo_flags |= VOFLAG_SW; @@ -462,7 +464,7 @@ static const struct m_option options[] = { OPT_FLAG("debug", use_gl_debug, 0), OPT_STRING_VALIDATE("backend", backend, 0, mpgl_validate_backend_opt), OPT_FLAG("sw", allow_sw, 0), - OPT_FLAG("es", es, 0), + OPT_CHOICE("es", es, 0, ({"no", -1}, {"auto", 0}, {"yes", 1})), OPT_INTPAIR("check-pattern", opt_pattern, 0), OPT_INTRANGE("vsync-fences", opt_vsync_fences, 0, 0, NUM_VSYNC_FENCES), @@ -502,6 +504,7 @@ const struct vo_driver video_out_opengl_hq = { .priv_size = sizeof(struct gl_priv), .priv_defaults = &(const struct gl_priv){ .renderer_opts = (struct gl_video_opts *)&gl_video_opts_hq_def, + .es = -1, }, .options = options, }; |