diff options
| author | Lynne <dev@lynne.ee> | 2021-11-19 12:07:10 +0100 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2021-11-19 13:44:47 +0100 |
| commit | b2aec70bd6bbf4620d363dfdc7d9e54f2f32f9ee (patch) | |
| tree | 1762efe01831e0e0d9804c1d551c739b3bb58bbf /libavfilter | |
| parent | d1133e8c44f457f0698c48f2efcedbd8626b3cee (diff) | |
| download | ffmpeg-b2aec70bd6bbf4620d363dfdc7d9e54f2f32f9ee.tar.gz | |
lavu/vulkan: add option to switch between shader compilers and cleanup glslang
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/glslang.c | 19 | ||||
| -rw-r--r-- | libavfilter/vulkan.c | 3 |
3 files changed, 0 insertions, 24 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 07b4a639ec..868ba68b79 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -578,8 +578,6 @@ SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_vpp.h SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h -OBJS-$(CONFIG_LIBGLSLANG) += glslang.o - TOOLS = graph2dot TESTPROGS = drawutils filtfmts formats integral diff --git a/libavfilter/glslang.c b/libavfilter/glslang.c deleted file mode 100644 index 9aa41567a3..0000000000 --- a/libavfilter/glslang.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "libavutil/vulkan_glslang.c" diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c index e0fcf87f21..08e0c37cc4 100644 --- a/libavfilter/vulkan.c +++ b/libavfilter/vulkan.c @@ -188,8 +188,5 @@ int ff_vk_filter_init(AVFilterContext *avctx) s->output_format = AV_PIX_FMT_NONE; - if (ff_vk_glslang_init()) - return AVERROR_EXTERNAL; - return 0; } |