lavu/vulkan: add support for using libshaderc as a GLSL compiler

It's got a much better API that's actually maintained, it eliminates race conditions, it comes with a pkg-config file by default, and unfortunately isn't currently packaged by Debian or other large distributions.

Lynne committed 4 years ago

Commit da72aca1 parent 1d060843 files · +140 −7Browse files

Unified · Split

3 files

configure +14 −7
libavutil/vulkan.c +4 −0
libavutil/vulkan_shaderc.c +122 −0

configure+14−7

   --enable-librsvg         enable SVG rasterization via librsvg [no]
   --enable-librubberband   enable rubberband needed for rubberband filter [no]
   --enable-librtmp         enable RTMP[E] support via librtmp [no]
+  --enable-libshaderc      enable GLSL->SPIRV compilation via libshaderc [no]
   --enable-libshine        enable fixed-point MP3 encoding via libshine [no]
   --enable-libsmbclient    enable Samba protocol via libsmbclient [no]
   --enable-libsnappy       enable Snappy compression, needed for hap encoding [no]
     librist
     librsvg
     librtmp
+    libshaderc
     libshine
     libsmbclient
     libsnappy
 atempo_filter_deps="avcodec"
 atempo_filter_select="rdft"
 avgblur_opencl_filter_deps="opencl"
-avgblur_vulkan_filter_deps="vulkan libglslang"
+avgblur_vulkan_filter_deps="vulkan spirv_compiler"
 azmq_filter_deps="libzmq"
 blackframe_filter_deps="gpl"
 bm3d_filter_deps="avcodec"
 boxblur_filter_deps="gpl"
 boxblur_opencl_filter_deps="opencl gpl"
 bs2b_filter_deps="libbs2b"
-chromaber_vulkan_filter_deps="vulkan libglslang"
+chromaber_vulkan_filter_deps="vulkan spirv_compiler"
 colorkey_opencl_filter_deps="opencl"
 colormatrix_filter_deps="gpl"
 convolution_opencl_filter_deps="opencl"
 frei0r_filter_deps="frei0r"
 frei0r_src_filter_deps="frei0r"
 fspp_filter_deps="gpl"
-gblur_vulkan_filter_deps="vulkan libglslang"
+gblur_vulkan_filter_deps="vulkan spirv_compiler"
 histeq_filter_deps="gpl"
 hqdn3d_filter_deps="gpl"
 interlace_filter_deps="gpl"
 overlay_opencl_filter_deps="opencl"
 overlay_qsv_filter_deps="libmfx"
 overlay_qsv_filter_select="qsvvpp"
-overlay_vulkan_filter_deps="vulkan libglslang"
+overlay_vulkan_filter_deps="vulkan spirv_compiler"
 owdenoise_filter_deps="gpl"
 pad_opencl_filter_deps="opencl"
 pan_filter_deps="swresample"
 zoompan_filter_deps="swscale"
 zscale_filter_deps="libzimg const_nan"
 scale_vaapi_filter_deps="vaapi"
-scale_vulkan_filter_deps="vulkan libglslang"
+scale_vulkan_filter_deps="vulkan spirv_compiler"
 vpp_qsv_filter_deps="libmfx"
 vpp_qsv_filter_select="qsvvpp"
 xfade_opencl_filter_deps="opencl"
       check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.11 ffnvcodec < 8.2" "$ffnv_hdr_list" ""
 fi
+if enabled_all libglslang libshaderc; then
+    die "ERROR: libshaderc and libglslang are mutually exclusive, if in doubt, disable libglslang"
+fi
 check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"
 if ! disabled w32threads && ! enabled pthreads; then
 enabled libfontconfig     && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
 enabled libfreetype       && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
 enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
-enabled libglslang && { check_lib libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
+enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
                             -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
                             -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
-                        require libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
+                        require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
                             -lglslang -lOSDependent -lHLSL -lOGLCompiler \
                             -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
 enabled libgme            && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
 enabled librsvg           && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo
 enabled librtmp           && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket
 enabled librubberband     && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new -lstdc++ && append librubberband_extralibs "-lstdc++"
+enabled libshaderc        && require_pkg_config spirv_compiler "shaderc >= 2019.1" shaderc/shaderc.h shaderc_compiler_initialize
 enabled libshine          && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
 enabled libsmbclient      && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
                                require libsmbclient libsmbclient.h smbc_init -lsmbclient; }

libavutil/vulkan.c+4−0

 #if CONFIG_LIBGLSLANG
 #include "vulkan_glslang.c"
+#elif CONFIG_LIBSHADERC
+#include "vulkan_shaderc.c"
 #endif
 /* Generic macro for creating contexts which need to keep their addresses
     if (!s->spirv_compiler) {
 #if CONFIG_LIBGLSLANG
         s->spirv_compiler = ff_vk_glslang_init();
+#elif CONFIG_LIBSHADERC
+        s->spirv_compiler = ff_vk_shaderc_init();
 #else
         return AVERROR(ENOSYS);
 #endif

libavutil/vulkan_shaderc.c+122−0

@@ -0,0 +1,122 @@
	1	/*
	2	* This file is part of FFmpeg.
	3	*
	4	* FFmpeg is free software; you can redistribute it and/or
	5	* modify it under the terms of the GNU Lesser General Public
	6	* License as published by the Free Software Foundation; either
	7	* version 2.1 of the License, or (at your option) any later version.
	8	*
	9	* FFmpeg is distributed in the hope that it will be useful,
	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	12	* Lesser General Public License for more details.
	13	*
	14	* You should have received a copy of the GNU Lesser General Public
	15	* License along with FFmpeg; if not, write to the Free Software
	16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	17	*/
	18
	19	#include <shaderc/shaderc.h>
	20
	21	#include "mem.h"
	22
	23	static int shdc_shader_compile(FFVkSPIRVCompiler ctx, void avctx,
	24	FFVkSPIRVShader shd, uint8_t *data,
	25	size_t size, const char entrypoint,
	26	void **opaque)
	27	{
	28	int loglevel, err, warn, ret;
	29	const char status, message;
	30	shaderc_compilation_result_t res;
	31	static const char *shdc_result[] = {
	32	[shaderc_compilation_status_success] = "success",
	33	[shaderc_compilation_status_invalid_stage] = "invalid stage",
	34	[shaderc_compilation_status_compilation_error] = "error",
	35	[shaderc_compilation_status_internal_error] = "internal error",
	36	[shaderc_compilation_status_null_result_object] = "no result",
	37	[shaderc_compilation_status_invalid_assembly] = "invalid assembly",
	38	};
	39	static const shaderc_shader_kind shdc_kind[] = {
	40	[VK_SHADER_STAGE_VERTEX_BIT] = shaderc_glsl_vertex_shader,
	41	[VK_SHADER_STAGE_FRAGMENT_BIT] = shaderc_glsl_fragment_shader,
	42	[VK_SHADER_STAGE_COMPUTE_BIT] = shaderc_glsl_compute_shader,
	43	};
	44
	45	shaderc_compile_options_t opts = shaderc_compile_options_initialize();
	46	if (!opts)
	47	return AVERROR(ENOMEM);
	48
	49	shaderc_compile_options_set_target_env(opts, shaderc_target_env_vulkan,
	50	shaderc_env_version_vulkan_1_2);
	51	shaderc_compile_options_set_target_spirv(opts, shaderc_spirv_version_1_5);
	52	shaderc_compile_options_set_optimization_level(opts,
	53	shaderc_optimization_level_performance);
	54
	55	res = shaderc_compile_into_spv((shaderc_compiler_t)ctx->priv,
	56	shd->src.str, strlen(shd->src.str),
	57	shdc_kind[shd->shader.stage],
	58	shd->name, entrypoint, opts);
	59	shaderc_compile_options_release(opts);
	60
	61	ret = shaderc_result_get_compilation_status(res);
	62	err = shaderc_result_get_num_errors(res);
	63	warn = shaderc_result_get_num_warnings(res);
	64	message = shaderc_result_get_error_message(res);
	65
	66	loglevel = err ? AV_LOG_ERROR : warn ? AV_LOG_WARNING : AV_LOG_VERBOSE;
	67
	68	ff_vk_print_shader(avctx, shd, loglevel);
	69	if (message && (err \|\| warn))
	70	av_log(avctx, loglevel, "%s\n", message);
	71	status = ret < FF_ARRAY_ELEMS(shdc_result) ? shdc_result[ret] : "unknown";
	72	av_log(avctx, loglevel, "shaderc compile status '%s' (%d errors, %d warnings)\n",
	73	status, err, warn);
	74
	75	if (err > 0)
	76	return AVERROR(EINVAL);
	77
	78	data = (uint8_t )shaderc_result_get_bytes(res);
	79	*size = shaderc_result_get_length(res);
	80	*opaque = res;
	81
	82	return 0;
	83	}
	84
	85	static void shdc_shader_free(FFVkSPIRVCompiler ctx, void *opaque)
	86	{
	87	if (!opaque \|\| !*opaque)
	88	return;
	89
	90	shaderc_result_release((shaderc_compilation_result_t)*opaque);
	91	*opaque = NULL;
	92	}
	93
	94	static void shdc_uninit(FFVkSPIRVCompiler **ctx)
	95	{
	96	FFVkSPIRVCompiler *s;
	97
	98	if (!ctx \|\| !*ctx)
	99	return;
	100
	101	s = *ctx;
	102
	103	shaderc_compiler_release((shaderc_compiler_t)s->priv);
	104	av_freep(ctx);
	105	}
	106
	107	static FFVkSPIRVCompiler *ff_vk_shaderc_init(void)
	108	{
	109	FFVkSPIRVCompiler ret = av_mallocz(sizeof(ret));
	110	if (!ret)
	111	return NULL;
	112
	113	ret->compile_shader = shdc_shader_compile;
	114	ret->free_shader = shdc_shader_free;
	115	ret->uninit = shdc_uninit;
	116
	117	ret->priv = (void *)shaderc_compiler_initialize();
	118	if (!ret->priv)
	119	av_freep(&ret);
	120
	121	return ret;
	122	}

lavu/vulkan: add support for using libshaderc as a GLSL compiler

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code