summaryrefslogtreecommitdiffstats
path: root/DOCS
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 /DOCS
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 'DOCS')
-rw-r--r--DOCS/interface-changes.rst2
-rw-r--r--DOCS/man/vo.rst17
2 files changed, 11 insertions, 8 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.