summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/interface-changes.rst2
-rw-r--r--DOCS/man/vo.rst17
-rw-r--r--video/out/vo.c5
-rw-r--r--video/out/vo_direct3d.c21
4 files changed, 13 insertions, 32 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 28319986d3..7ceb75709c 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -50,6 +50,8 @@ Interface changes
- remove the vo-cmdline command. You can set OpenGL renderer options
directly via properties instead.
- deprecate the ao and vo auto-profiles (they never made any sense)
+ - deprecate "--vo=direct3d_shaders" - use "--vo=direct3d" instead.
+ Change "--vo=direct3d" to always use shaders by default.
--- mpv 0.20.0 ---
- add --image-display-duration option - this also means that image duration
is not influenced by --mf-fps anymore in the general case (this is an
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index f9d02ec98b..9df07d90dd 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -199,11 +199,18 @@ Available video output drivers are:
driver implementation may also have limits on the length of maximum
queuing time or number of queued surfaces that work well or at all.
-``direct3d_shaders`` (Windows only)
+``direct3d`` (Windows only)
Video output driver that uses the Direct3D interface.
.. note:: This driver is for compatibility with systems that don't provide
- proper OpenGL drivers.
+ proper OpenGL drivers, and where ANGLE does not perform well.
+
+ .. note:: Before to 0.21.0, ``direct3d_shaders`` and ``direct3d`` were
+ different, with ``direct3d`` not using shader by default. Now
+ both use shaders by default, and ``direct3d_shaders`` is a
+ deprecated alias. Use the ``prefer-stretchrect`` or the
+ ``disable-shaders`` sub-options to get the old behavior of
+ ``direct3d``.
``prefer-stretchrect``
Use ``IDirect3DDevice9::StretchRect`` over other methods if possible.
@@ -268,12 +275,6 @@ Available video output drivers are:
``exact-backbuffer``
Always resize the backbuffer to window size.
-``direct3d`` (Windows only)
- Same as ``direct3d_shaders``, but with the options ``disable-textures``
- and ``disable-shaders`` forced.
-
- .. note:: This driver is for compatibility with old systems.
-
``opengl``
OpenGL video output driver. It supports extended scaling methods, dithering
and color management.
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,
};