diff options
author | wm4 <wm4@nowhere> | 2012-09-23 16:10:00 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-03 03:17:39 +0200 |
commit | 3611d1bf9ba6f34909108166aaa21deaffc72c57 (patch) | |
tree | cd7c2ee5c1a50140d417e7a1a761b6ac4f12cfd4 /libvo/vo_opengl.c | |
parent | 4ecb1b53debb54e5dccf460fb245416148afbfa8 (diff) | |
download | mpv-3611d1bf9ba6f34909108166aaa21deaffc72c57.tar.bz2 mpv-3611d1bf9ba6f34909108166aaa21deaffc72c57.tar.xz |
VO: actually rename VOs gl -> opengl-old, gl3 -> opengl
This renames vo_gl3 to vo_opengl, and makes it the default. The old
vo_gl is still available under "opengl-old".
We keep "gl3" as alias to "opengl" for short-term compatibility.
For OSX/Cocoa, the autoprobe order changes (prefer the "opengl" over
"opengl-old").
Remove "gl_nosw". This was a compatibility alias for "opengl-old", and
there's no point in keeping it.
Diffstat (limited to 'libvo/vo_opengl.c')
-rw-r--r-- | libvo/vo_opengl.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/libvo/vo_opengl.c b/libvo/vo_opengl.c index d2a28aa41a..2f1cc0545b 100644 --- a/libvo/vo_opengl.c +++ b/libvo/vo_opengl.c @@ -54,7 +54,7 @@ #include "fastmemcpy.h" #include "sub/ass_mp.h" -static const char vo_gl3_shaders[] = +static const char vo_opengl_shaders[] = // Generated from libvo/vo_opengl_shaders.glsl #include "libvo/vo_opengl_shaders.h" ; @@ -655,7 +655,7 @@ static void compile_shaders(struct gl_priv *p) void *tmp = talloc_new(NULL); - struct bstr src = bstr0(vo_gl3_shaders); + struct bstr src = bstr0(vo_opengl_shaders); char *vertex_shader = get_section(tmp, src, "vertex_all"); char *shader_prelude = get_section(tmp, src, "prelude"); char *s_video = get_section(tmp, src, "frag_video"); @@ -2437,10 +2437,29 @@ err_out: return -1; } +const struct vo_driver video_out_opengl = { + .is_new = true, + .info = &(const vo_info_t) { + "Extended OpenGL Renderer", + "opengl", + "Based on vo_gl.c by Reimar Doeffinger", + "" + }, + .preinit = preinit, + .config = config, + .control = control, + .draw_slice = draw_slice, + .draw_osd = draw_osd, + .flip_page = flip_page, + .check_events = check_events, + .uninit = uninit, +}; + +// short-term compatibility const struct vo_driver video_out_gl3 = { .is_new = true, .info = &(const vo_info_t) { - "OpenGL 3.x", + "Extended OpenGL Renderer", "gl3", "Based on vo_gl.c by Reimar Doeffinger", "" @@ -2456,8 +2475,8 @@ const struct vo_driver video_out_gl3 = { }; static const char help_text[] = -"\n--vo=gl3 command line help:\n" -"Example: mplayer --vo=gl3:scale-sep:lscale=lanczos2\n" +"\n--vo=opengl command line help:\n" +"Example: mplayer --vo=opengl:scale-sep:lscale=lanczos2\n" "\nOptions:\n" " lscale=<filter>\n" " Set the scaling filter. Possible choices:\n" |