Skip to content

Commit da72aca

Browse files
committed
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.
1 parent 1d06084 commit da72aca

File tree

3 files changed

+140
-7
lines changed

3 files changed

+140
-7
lines changed

configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ External library support:
262262
--enable-librsvg enable SVG rasterization via librsvg [no]
263263
--enable-librubberband enable rubberband needed for rubberband filter [no]
264264
--enable-librtmp enable RTMP[E] support via librtmp [no]
265+
--enable-libshaderc enable GLSL->SPIRV compilation via libshaderc [no]
265266
--enable-libshine enable fixed-point MP3 encoding via libshine [no]
266267
--enable-libsmbclient enable Samba protocol via libsmbclient [no]
267268
--enable-libsnappy enable Snappy compression, needed for hap encoding [no]
@@ -1834,6 +1835,7 @@ EXTERNAL_LIBRARY_LIST="
18341835
librist
18351836
librsvg
18361837
librtmp
1838+
libshaderc
18371839
libshine
18381840
libsmbclient
18391841
libsnappy
@@ -3565,15 +3567,15 @@ ass_filter_deps="libass"
35653567
atempo_filter_deps="avcodec"
35663568
atempo_filter_select="rdft"
35673569
avgblur_opencl_filter_deps="opencl"
3568-
avgblur_vulkan_filter_deps="vulkan libglslang"
3570+
avgblur_vulkan_filter_deps="vulkan spirv_compiler"
35693571
azmq_filter_deps="libzmq"
35703572
blackframe_filter_deps="gpl"
35713573
bm3d_filter_deps="avcodec"
35723574
bm3d_filter_select="dct"
35733575
boxblur_filter_deps="gpl"
35743576
boxblur_opencl_filter_deps="opencl gpl"
35753577
bs2b_filter_deps="libbs2b"
3576-
chromaber_vulkan_filter_deps="vulkan libglslang"
3578+
chromaber_vulkan_filter_deps="vulkan spirv_compiler"
35773579
colorkey_opencl_filter_deps="opencl"
35783580
colormatrix_filter_deps="gpl"
35793581
convolution_opencl_filter_deps="opencl"
@@ -3613,7 +3615,7 @@ frei0r_deps_any="libdl LoadLibrary"
36133615
frei0r_filter_deps="frei0r"
36143616
frei0r_src_filter_deps="frei0r"
36153617
fspp_filter_deps="gpl"
3616-
gblur_vulkan_filter_deps="vulkan libglslang"
3618+
gblur_vulkan_filter_deps="vulkan spirv_compiler"
36173619
histeq_filter_deps="gpl"
36183620
hqdn3d_filter_deps="gpl"
36193621
interlace_filter_deps="gpl"
@@ -3638,7 +3640,7 @@ openclsrc_filter_deps="opencl"
36383640
overlay_opencl_filter_deps="opencl"
36393641
overlay_qsv_filter_deps="libmfx"
36403642
overlay_qsv_filter_select="qsvvpp"
3641-
overlay_vulkan_filter_deps="vulkan libglslang"
3643+
overlay_vulkan_filter_deps="vulkan spirv_compiler"
36423644
owdenoise_filter_deps="gpl"
36433645
pad_opencl_filter_deps="opencl"
36443646
pan_filter_deps="swresample"
@@ -3701,7 +3703,7 @@ zmq_filter_deps="libzmq"
37013703
zoompan_filter_deps="swscale"
37023704
zscale_filter_deps="libzimg const_nan"
37033705
scale_vaapi_filter_deps="vaapi"
3704-
scale_vulkan_filter_deps="vulkan libglslang"
3706+
scale_vulkan_filter_deps="vulkan spirv_compiler"
37053707
vpp_qsv_filter_deps="libmfx"
37063708
vpp_qsv_filter_select="qsvvpp"
37073709
xfade_opencl_filter_deps="opencl"
@@ -6327,6 +6329,10 @@ if ! disabled ffnvcodec; then
63276329
check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.11 ffnvcodec < 8.2" "$ffnv_hdr_list" ""
63286330
fi
63296331

6332+
if enabled_all libglslang libshaderc; then
6333+
die "ERROR: libshaderc and libglslang are mutually exclusive, if in doubt, disable libglslang"
6334+
fi
6335+
63306336
check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"
63316337

63326338
if ! disabled w32threads && ! enabled pthreads; then
@@ -6443,10 +6449,10 @@ enabled fontconfig && enable libfontconfig
64436449
enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
64446450
enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
64456451
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
6446-
enabled libglslang && { check_lib libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
6452+
enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
64476453
-lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
64486454
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
6449-
require libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
6455+
require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
64506456
-lglslang -lOSDependent -lHLSL -lOGLCompiler \
64516457
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
64526458
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
@@ -6504,6 +6510,7 @@ enabled librist && require_pkg_config librist "librist >= 0.2" librist
65046510
enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo
65056511
enabled librtmp && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket
65066512
enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new -lstdc++ && append librubberband_extralibs "-lstdc++"
6513+
enabled libshaderc && require_pkg_config spirv_compiler "shaderc >= 2019.1" shaderc/shaderc.h shaderc_compiler_initialize
65076514
enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
65086515
enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
65096516
require libsmbclient libsmbclient.h smbc_init -lsmbclient; }

libavutil/vulkan.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
#if CONFIG_LIBGLSLANG
2525
#include "vulkan_glslang.c"
26+
#elif CONFIG_LIBSHADERC
27+
#include "vulkan_shaderc.c"
2628
#endif
2729

2830
/* Generic macro for creating contexts which need to keep their addresses
@@ -859,6 +861,8 @@ int ff_vk_compile_shader(FFVulkanContext *s, FFVkSPIRVShader *shd,
859861
if (!s->spirv_compiler) {
860862
#if CONFIG_LIBGLSLANG
861863
s->spirv_compiler = ff_vk_glslang_init();
864+
#elif CONFIG_LIBSHADERC
865+
s->spirv_compiler = ff_vk_shaderc_init();
862866
#else
863867
return AVERROR(ENOSYS);
864868
#endif

libavutil/vulkan_shaderc.c

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
}

0 commit comments

Comments
 (0)