From 5bcac8580df6fc62323136f756a3a6d1e754fe9c Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Sat, 24 Nov 2018 04:25:30 +0100 Subject: 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. --- video/out/gpu/spirv.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'video/out/gpu/spirv.c') diff --git a/video/out/gpu/spirv.c b/video/out/gpu/spirv.c index 06d33686d0..ee11d601a3 100644 --- a/video/out/gpu/spirv.c +++ b/video/out/gpu/spirv.c @@ -5,31 +5,23 @@ #include "config.h" extern const struct spirv_compiler_fns spirv_shaderc; -extern const struct spirv_compiler_fns spirv_nvidia_builtin; // in probe-order enum { SPIRV_AUTO = 0, SPIRV_SHADERC, // generally preferred, but not packaged everywhere - SPIRV_NVIDIA, // can be useful for testing, only available on nvidia }; static const struct spirv_compiler_fns *compilers[] = { #if HAVE_SHADERC [SPIRV_SHADERC] = &spirv_shaderc, #endif -#if HAVE_VULKAN - [SPIRV_NVIDIA] = &spirv_nvidia_builtin, -#endif }; static const struct m_opt_choice_alternatives compiler_choices[] = { {"auto", SPIRV_AUTO}, #if HAVE_SHADERC {"shaderc", SPIRV_SHADERC}, -#endif -#if HAVE_VULKAN - {"nvidia", SPIRV_NVIDIA}, #endif {0} }; -- cgit v1.2.3