summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-09 18:55:44 +0200
committerwm4 <wm4@nowhere>2017-10-09 18:55:44 +0200
commitcdef69103a9c0bed742563a98d21099650ba478f (patch)
tree1ce3b0e35371905e47565388fe66100bd86b45e4 /video
parentb43bf12fa6717a748168a82f02a268cf28907c3b (diff)
downloadmpv-cdef69103a9c0bed742563a98d21099650ba478f.tar.bz2
mpv-cdef69103a9c0bed742563a98d21099650ba478f.tar.xz
vo_gpu: simplify opengl alias
This makes the replacement warning message worse, but I don't think I care enough.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo.c5
-rw-r--r--video/out/vo_gpu.c28
2 files changed, 2 insertions, 31 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index ff8c381f60..5212546d90 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -52,7 +52,6 @@ extern const struct vo_driver video_out_x11;
extern const struct vo_driver video_out_vdpau;
extern const struct vo_driver video_out_xv;
extern const struct vo_driver video_out_gpu;
-extern const struct vo_driver video_out_opengl;
extern const struct vo_driver video_out_opengl_cb;
extern const struct vo_driver video_out_null;
extern const struct vo_driver video_out_image;
@@ -106,7 +105,6 @@ const struct vo_driver *const video_out_drivers[] =
&video_out_lavc,
#endif
#if HAVE_GL
- &video_out_opengl,
&video_out_opengl_cb,
#endif
NULL
@@ -196,8 +194,9 @@ const struct m_obj_list vo_obj_list = {
.get_desc = get_desc,
.description = "video outputs",
.aliases = {
- {"gl", "opengl"},
+ {"gl", "gpu"},
{"direct3d_shaders", "direct3d"},
+ {"opengl", "gpu"},
{0}
},
.allow_unknown_entries = true,
diff --git a/video/out/vo_gpu.c b/video/out/vo_gpu.c
index d05cfa8578..f4342813d3 100644
--- a/video/out/vo_gpu.c
+++ b/video/out/vo_gpu.c
@@ -349,31 +349,3 @@ const struct vo_driver video_out_gpu = {
.priv_defaults = &defaults,
.options = options,
};
-
-static int preinit_opengl(struct vo *vo)
-{
- MP_WARN(vo, "--vo=opengl was replaced by --vo=gpu --gpu-api=opengl, and will"
- " be removed in the future!\n");
-
- struct gpu_priv *p = vo->priv;
- p->force_gl = true;
- return preinit(vo);
-}
-
-const struct vo_driver video_out_opengl = {
- .description = "Shader-based GPU Renderer",
- .name = "opengl",
- .caps = VO_CAP_ROTATE90,
- .preinit = preinit_opengl,
- .query_format = query_format,
- .reconfig = reconfig,
- .control = control,
- .get_image = get_image,
- .draw_frame = draw_frame,
- .flip_page = flip_page,
- .wait_events = wait_events,
- .wakeup = wakeup,
- .uninit = uninit,
- .priv_size = sizeof(struct gpu_priv),
- .priv_defaults = &defaults,
-};