This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit ae1a227cf676e2c02b64a07e73435e288fa27f94 Author: Lynne <[email protected]> AuthorDate: Tue Feb 3 08:57:46 2026 +0100 Commit: Lynne <[email protected]> CommitDate: Thu Feb 19 19:42:20 2026 +0100 Makefile: specify GLSL version via command line arguments GLSL strictly mandates the version must be the very first non-comment statement, which results in issues when #including for templating. --- configure | 4 ++-- libavcodec/vulkan/dpx_copy.comp.glsl | 1 - libavcodec/vulkan/dpx_unpack.comp.glsl | 1 - libavcodec/vulkan/prores_idct.comp.glsl | 1 - libavcodec/vulkan/prores_raw_decode.comp.glsl | 1 - libavcodec/vulkan/prores_raw_idct.comp.glsl | 1 - libavcodec/vulkan/prores_vld.comp.glsl | 1 - libavfilter/vulkan/avgblur.comp.glsl | 1 - libavfilter/vulkan/bwdif.comp.glsl | 1 - libavfilter/vulkan/debayer.comp.glsl | 1 - 10 files changed, 2 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 28356ebf74..7830991de2 100755 --- a/configure +++ b/configure @@ -7727,7 +7727,7 @@ probe_glslc(){ if test_cmd $glslc_probe -v; then # glslang/glslangValidator glslc=$glslc_probe - glslcflags="-V --target-env spirv1.6" + glslcflags="-V --target-env spirv1.6 --glsl-version 460" glslc_opt_speed="" glslc_opt_size="-Os" glslc_opt_none="-Od" @@ -7736,7 +7736,7 @@ probe_glslc(){ elif test_cmd $glslc_probe --version; then # glslc glslc=$glslc_probe - glslcflags="--target-env=vulkan1.4 --target-spv=spv1.6" + glslcflags="--target-env=vulkan1.4 --target-spv=spv1.6 -std=460" glslc_opt_speed="-O" glslc_opt_size="-Os" glslc_opt_none="-O0" diff --git a/libavcodec/vulkan/dpx_copy.comp.glsl b/libavcodec/vulkan/dpx_copy.comp.glsl index d9651dbfdf..f106195182 100644 --- a/libavcodec/vulkan/dpx_copy.comp.glsl +++ b/libavcodec/vulkan/dpx_copy.comp.glsl @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require diff --git a/libavcodec/vulkan/dpx_unpack.comp.glsl b/libavcodec/vulkan/dpx_unpack.comp.glsl index 3850cbf3e9..badc48a52a 100644 --- a/libavcodec/vulkan/dpx_unpack.comp.glsl +++ b/libavcodec/vulkan/dpx_unpack.comp.glsl @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require diff --git a/libavcodec/vulkan/prores_idct.comp.glsl b/libavcodec/vulkan/prores_idct.comp.glsl index 800a93db66..1da19d34e9 100644 --- a/libavcodec/vulkan/prores_idct.comp.glsl +++ b/libavcodec/vulkan/prores_idct.comp.glsl @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require diff --git a/libavcodec/vulkan/prores_raw_decode.comp.glsl b/libavcodec/vulkan/prores_raw_decode.comp.glsl index 9c4def2872..e4b00b1440 100644 --- a/libavcodec/vulkan/prores_raw_decode.comp.glsl +++ b/libavcodec/vulkan/prores_raw_decode.comp.glsl @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require diff --git a/libavcodec/vulkan/prores_raw_idct.comp.glsl b/libavcodec/vulkan/prores_raw_idct.comp.glsl index 44efc9adb6..5e3a2fa67c 100644 --- a/libavcodec/vulkan/prores_raw_idct.comp.glsl +++ b/libavcodec/vulkan/prores_raw_idct.comp.glsl @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require diff --git a/libavcodec/vulkan/prores_vld.comp.glsl b/libavcodec/vulkan/prores_vld.comp.glsl index 85b4dbdd61..9020d46fa1 100644 --- a/libavcodec/vulkan/prores_vld.comp.glsl +++ b/libavcodec/vulkan/prores_vld.comp.glsl @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require diff --git a/libavfilter/vulkan/avgblur.comp.glsl b/libavfilter/vulkan/avgblur.comp.glsl index b53ec4092c..4cfd4f433d 100644 --- a/libavfilter/vulkan/avgblur.comp.glsl +++ b/libavfilter/vulkan/avgblur.comp.glsl @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_EXT_shader_image_load_formatted : require diff --git a/libavfilter/vulkan/bwdif.comp.glsl b/libavfilter/vulkan/bwdif.comp.glsl index fb18af3915..d38109a7fc 100644 --- a/libavfilter/vulkan/bwdif.comp.glsl +++ b/libavfilter/vulkan/bwdif.comp.glsl @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_EXT_shader_image_load_formatted : require diff --git a/libavfilter/vulkan/debayer.comp.glsl b/libavfilter/vulkan/debayer.comp.glsl index ccf4996c49..0a4e22de99 100644 --- a/libavfilter/vulkan/debayer.comp.glsl +++ b/libavfilter/vulkan/debayer.comp.glsl @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#version 460 #pragma shader_stage(compute) #extension GL_EXT_shader_image_load_formatted : require _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
