From 88982f2855590cafb1fdce916384751ae728ba0c Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 19 Dec 2014 18:37:16 +0100 Subject: 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. --- video/out/vo_opengl_old.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'video/out/vo_opengl_old.c') diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index a3a8b69c0a..bf117fdbd9 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -2168,11 +2168,10 @@ static int preinit(struct vo *vo) if (p->stereo_mode == GL_3D_QUADBUFFER) vo_flags |= VOFLAG_STEREO; - int mpgl_caps = MPGL_CAP_GL_LEGACY; - if (!p->allow_sw) - mpgl_caps |= MPGL_CAP_NO_SW; + if (p->allow_sw) + vo->probing = false; - p->glctx = mpgl_init(vo, p->backend_arg, mpgl_caps, vo_flags); + p->glctx = mpgl_init(vo, p->backend_arg, MPGL_CAP_GL_LEGACY, vo_flags); if (!p->glctx) goto err_out; p->gl = p->glctx->gl; -- cgit v1.2.3