diff options
| author | wm4 <wm4@nowhere> | 2014-12-19 18:37:16 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-12-19 18:54:39 +0100 |
| commit | 88982f2855590cafb1fdce916384751ae728ba0c (patch) | |
| tree | fbc954496ac649aef5f253f33002010f9a30086f /video/out/vo_opengl.c | |
| parent | bebc323c6d6aab298f920cd462e7c0fe375925db (diff) | |
| download | mpv-88982f2855590cafb1fdce916384751ae728ba0c.tar.bz2 mpv-88982f2855590cafb1fdce916384751ae728ba0c.tar.xz | |
vo_opengl: better probe handling
Involve detection of software renderers in the probing properly. Other
VOs could handle probing also more gracefully, and e.g. produce less
noise if an API is unavailable. (Although other than the OpenGL VOs,
only vo_wayland will.)
Now the "sw" suboption for vo_opengl[_old] is strictly speaking not
needed anymore. Doing "--vo=opengl" disables the probing logic, and will
always force it, if possible.
Includes some simplifications as well.
Diffstat (limited to 'video/out/vo_opengl.c')
| -rw-r--r-- | video/out/vo_opengl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index ab7d2380c7..bc98f513a7 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -408,11 +408,10 @@ static int preinit(struct vo *vo) if (p->use_gl_debug) vo_flags |= VOFLAG_GL_DEBUG; - int mpgl_caps = MPGL_CAP_GL21; - if (!p->allow_sw) - mpgl_caps |= MPGL_CAP_NO_SW; + if (p->allow_sw) + vo->probing = false; - p->glctx = mpgl_init(vo, p->backend, mpgl_caps, vo_flags); + p->glctx = mpgl_init(vo, p->backend, 210, vo_flags); if (!p->glctx) goto err_out; p->gl = p->glctx->gl; |