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/gl_common.h | |
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/gl_common.h')
-rw-r--r-- | video/out/gl_common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/gl_common.h b/video/out/gl_common.h index e391663b93..f70614972a 100644 --- a/video/out/gl_common.h +++ b/video/out/gl_common.h @@ -79,7 +79,7 @@ enum { MPGL_CAP_TEX_RG = (1 << 10), // GL_ARB_texture_rg / GL 3.x MPGL_CAP_VDPAU = (1 << 11), // GL_NV_vdpau_interop MPGL_CAP_APPLE_RGB_422 = (1 << 12), // GL_APPLE_rgb_422 - MPGL_CAP_NO_SW = (1 << 30), // used to block sw. renderers + MPGL_CAP_SW = (1 << 30), // indirect or sw renderer }; // E.g. 310 means 3.1 @@ -136,11 +136,11 @@ bool mpgl_is_thread_safe(MPGLContext *ctx); // Create a VO window and create a GL context on it. // (Calls config_window_gl3 or config_window+setGlWindow.) -// gl_caps: bitfield of MPGL_CAP_* (required GL version and feature set) +// gl_flavor: 110 for legacy GL, 210 for GL 2.1 or 3.x core // flags: passed to the backend's create window function // Returns success. MPGLContext *mpgl_init(struct vo *vo, const char *backend_name, - int gl_caps, int vo_flags); + int gl_flavor, int vo_flags); void mpgl_uninit(MPGLContext *ctx); // flags: passed to the backend function |