summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-05 21:05:31 +0200
committerwm4 <wm4@nowhere>2016-09-05 21:26:39 +0200
commit327cb2a06c32f2c05fc266272936080d06103a63 (patch)
tree17a9a0c160073a4090d1f2d59ae107f056080051 /video
parent9e6b9d8a982eb07a05fd059a92f1d6b2f01460a0 (diff)
downloadmpv-327cb2a06c32f2c05fc266272936080d06103a63.tar.bz2
mpv-327cb2a06c32f2c05fc266272936080d06103a63.tar.xz
vo_direct3d: deprecate direct3d_shaders alias
And remove the difference between the aliases. This is needed to make the sub-option changes less painful.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo.c5
-rw-r--r--video/out/vo_direct3d.c21
2 files changed, 2 insertions, 24 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 050a5303e6..3e6a2c7070 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -55,7 +55,6 @@ extern const struct vo_driver video_out_lavc;
extern const struct vo_driver video_out_caca;
extern const struct vo_driver video_out_drm;
extern const struct vo_driver video_out_direct3d;
-extern const struct vo_driver video_out_direct3d_shaders;
extern const struct vo_driver video_out_sdl;
extern const struct vo_driver video_out_vaapi;
extern const struct vo_driver video_out_wayland;
@@ -73,7 +72,6 @@ const struct vo_driver *const video_out_drivers[] =
&video_out_vdpau,
#endif
#if HAVE_DIRECT3D
- &video_out_direct3d_shaders,
&video_out_direct3d,
#endif
#if HAVE_WAYLAND
@@ -186,7 +184,8 @@ const struct m_obj_list vo_obj_list = {
.get_desc = get_desc,
.description = "video outputs",
.aliases = {
- {"gl", "opengl"},
+ {"gl", "opengl"},
+ {"direct3d_shaders", "direct3d"},
{0}
},
.allow_unknown_entries = true,
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 6279c0be75..7307c45fa4 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -1732,12 +1732,6 @@ static const struct m_option opts[] = {
{0}
};
-static const d3d_priv defaults_noshaders = {
- .video_eq = { MP_CSP_EQ_CAPS_COLORMATRIX },
- .opt_disable_shaders = 1,
- .opt_disable_textures = 1,
-};
-
static const d3d_priv defaults = {
.video_eq = { MP_CSP_EQ_CAPS_COLORMATRIX },
};
@@ -1753,21 +1747,6 @@ const struct vo_driver video_out_direct3d = {
.flip_page = flip_page,
.uninit = uninit,
.priv_size = sizeof(d3d_priv),
- .priv_defaults = &defaults_noshaders,
- .options = opts,
-};
-
-const struct vo_driver video_out_direct3d_shaders = {
- .description = "Direct3D 9 Renderer (using shaders for YUV conversion)",
- .name = "direct3d_shaders",
- .preinit = preinit,
- .query_format = query_format,
- .reconfig = reconfig,
- .control = control,
- .draw_image = draw_image,
- .flip_page = flip_page,
- .uninit = uninit,
- .priv_size = sizeof(d3d_priv),
.priv_defaults = &defaults,
.options = opts,
};