summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2018-11-24 04:25:30 +0100
committerJan Ekström <jeebjp@gmail.com>2018-12-01 15:50:23 +0200
commit5bcac8580df6fc62323136f756a3a6d1e754fe9c (patch)
tree523664b7c0cc396e75b18f1c396bed544accfb01 /DOCS
parentf0509d3738ec37cfa4afa81f070c8abd876e6561 (diff)
downloadmpv-5bcac8580df6fc62323136f756a3a6d1e754fe9c.tar.bz2
mpv-5bcac8580df6fc62323136f756a3a6d1e754fe9c.tar.xz
spirv: remove --spirv-compiler=nvidia
This option has been deprecated upstream for a long time, probably doesn't even work anymore, and won't work moving forwards as we replace the vulkan code by libplacebo wrappers. I haven't removed the option completely yet since in theory we could still add support for e.g. a native glslang wrapper in the future. But most likely the future of this code is deletion. As an aside, fix an issue where the man page didn't mention d3d11.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/interface-changes.rst3
-rw-r--r--DOCS/man/options.rst13
2 files changed, 10 insertions, 6 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 26f39beba7..cbc9af18f8 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -44,6 +44,9 @@ Interface changes
`--linear-downscaling`. This means that `--sigmoid-upscaling` no longer
implies linear light downscaling as well, which was confusing.
- the built-in `gpu-hq` profile now includes` --linear-downscaling`.
+ - support for `--spirv-compiler=nvidia` has been removed, leaving `shaderc`
+ as the only option. The `--spirv-compiler` option itself has been marked
+ as deprecated, and may be removed in the future.
--- mpv 0.29.0 ---
- drop --opensles-sample-rate, as --audio-samplerate should be used if desired
- drop deprecated --videotoolbox-format, --ff-aid, --ff-vid, --ff-sid,
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index e8c548d3a7..2aaad5febc 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -4522,18 +4522,19 @@ The following video options are currently all specific to ``--vo=gpu`` and
``--spirv-compiler=<compiler>``
Controls which compiler is used to translate GLSL to SPIR-V. This is
- (currently) only relevant for ``--gpu-api=vulkan``. The possible choices
- are:
+ (currently) only relevant for ``--gpu-api=vulkan`` and `--gpu-api=d3d11`.
+ The possible choices are currently only:
auto
Use the first available compiler. (Default)
shaderc
Use libshaderc, which is an API wrapper around glslang. This is
generally the most preferred, if available.
- nvidia
- Use nvidia's built-in compiler. Only works for nvidia GPUs. Can be
- buggy, but also supports some features glslang does not. Only works
- with vulkan.
+
+ .. note::
+
+ This option is deprecated, since there is only one reasonable value.
+ It may be removed in the future.
``--glsl-shaders=<file-list>``
Custom GLSL hooks. These are a flexible way to add custom fragment shaders,