This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit c4879dbbdad8b0d4937c0707d53ae12d3861c0c2 Author: Lynne <[email protected]> AuthorDate: Wed Feb 4 17:32:29 2026 +0100 Commit: Lynne <[email protected]> CommitDate: Thu Feb 19 19:42:29 2026 +0100 avcodec/vulkan: standardize on .glsl extension None of the files are strictly compute now. --- libavcodec/vulkan/{common.comp => common.glsl} | 0 libavcodec/vulkan/dpx_copy.comp.glsl | 2 +- libavcodec/vulkan/dpx_unpack.comp.glsl | 2 +- libavcodec/vulkan/ffv1_common.glsl | 4 ++-- libavcodec/vulkan/ffv1_dec.comp.glsl | 2 +- libavcodec/vulkan/ffv1_dec_reset.comp.glsl | 2 +- libavcodec/vulkan/ffv1_dec_setup.comp.glsl | 2 +- libavcodec/vulkan/ffv1_enc.comp.glsl | 2 +- libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl | 2 +- libavcodec/vulkan/ffv1_enc_reset.comp.glsl | 2 +- libavcodec/vulkan/ffv1_enc_setup.comp.glsl | 2 +- libavcodec/vulkan/{ffv1_vlc.comp => ffv1_vlc.glsl} | 5 +++++ libavcodec/vulkan/prores_idct.comp.glsl | 2 +- libavcodec/vulkan/prores_raw_decode.comp.glsl | 2 +- libavcodec/vulkan/prores_raw_idct.comp.glsl | 2 +- libavcodec/vulkan/prores_vld.comp.glsl | 2 +- libavcodec/vulkan/{rangecoder.comp => rangecoder.glsl} | 7 +++++-- 17 files changed, 25 insertions(+), 17 deletions(-) diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.glsl similarity index 100% rename from libavcodec/vulkan/common.comp rename to libavcodec/vulkan/common.glsl diff --git a/libavcodec/vulkan/dpx_copy.comp.glsl b/libavcodec/vulkan/dpx_copy.comp.glsl index f83b03d6a0..124caea494 100644 --- a/libavcodec/vulkan/dpx_copy.comp.glsl +++ b/libavcodec/vulkan/dpx_copy.comp.glsl @@ -21,7 +21,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" layout (constant_id = 0) const bool big_endian = false; layout (constant_id = 1) const int type_bits = 0; diff --git a/libavcodec/vulkan/dpx_unpack.comp.glsl b/libavcodec/vulkan/dpx_unpack.comp.glsl index ed6959a904..e169ac07aa 100644 --- a/libavcodec/vulkan/dpx_unpack.comp.glsl +++ b/libavcodec/vulkan/dpx_unpack.comp.glsl @@ -21,7 +21,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" layout (constant_id = 0) const bool big_endian = false; layout (constant_id = 1) const bool packed_10bit = false; diff --git a/libavcodec/vulkan/ffv1_common.glsl b/libavcodec/vulkan/ffv1_common.glsl index 3c13ab2c6a..375ce3a946 100644 --- a/libavcodec/vulkan/ffv1_common.glsl +++ b/libavcodec/vulkan/ffv1_common.glsl @@ -23,9 +23,9 @@ #ifndef VULKAN_FFV1_COMMON_H #define VULKAN_FFV1_COMMON_H -#include "rangecoder.comp" +#include "rangecoder.glsl" #ifdef GOLOMB -#include "ffv1_vlc.comp" +#include "ffv1_vlc.glsl" #endif #define MAX_QUANT_TABLES 8 diff --git a/libavcodec/vulkan/ffv1_dec.comp.glsl b/libavcodec/vulkan/ffv1_dec.comp.glsl index c5dde13868..584735f35e 100644 --- a/libavcodec/vulkan/ffv1_dec.comp.glsl +++ b/libavcodec/vulkan/ffv1_dec.comp.glsl @@ -24,7 +24,7 @@ #extension GL_GOOGLE_include_directive : require #define DECODE -#include "common.comp" +#include "common.glsl" #include "ffv1_common.glsl" layout (set = 1, binding = 1, scalar) readonly buffer slice_offsets_buf { diff --git a/libavcodec/vulkan/ffv1_dec_reset.comp.glsl b/libavcodec/vulkan/ffv1_dec_reset.comp.glsl index e157923d0a..e708d03036 100644 --- a/libavcodec/vulkan/ffv1_dec_reset.comp.glsl +++ b/libavcodec/vulkan/ffv1_dec_reset.comp.glsl @@ -23,7 +23,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" #include "ffv1_common.glsl" void main(void) diff --git a/libavcodec/vulkan/ffv1_dec_setup.comp.glsl b/libavcodec/vulkan/ffv1_dec_setup.comp.glsl index 4607a8105a..3502b4a176 100644 --- a/libavcodec/vulkan/ffv1_dec_setup.comp.glsl +++ b/libavcodec/vulkan/ffv1_dec_setup.comp.glsl @@ -23,7 +23,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" #include "ffv1_common.glsl" layout (set = 0, binding = 1, scalar) uniform crc_ieee_buf { diff --git a/libavcodec/vulkan/ffv1_enc.comp.glsl b/libavcodec/vulkan/ffv1_enc.comp.glsl index 71d5bb982c..7be01be1d9 100644 --- a/libavcodec/vulkan/ffv1_enc.comp.glsl +++ b/libavcodec/vulkan/ffv1_enc.comp.glsl @@ -24,7 +24,7 @@ #extension GL_GOOGLE_include_directive : require #define ENCODE -#include "common.comp" +#include "common.glsl" #include "ffv1_common.glsl" layout (set = 0, binding = 2, scalar) uniform crc_ieee_buf { diff --git a/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl b/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl index 66fc73a8e5..9c6dc2ecf3 100644 --- a/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl +++ b/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl @@ -24,7 +24,7 @@ #extension GL_GOOGLE_include_directive : require #define ENCODE -#include "common.comp" +#include "common.glsl" #include "ffv1_common.glsl" layout (set = 1, binding = 1) uniform uimage2D src[]; diff --git a/libavcodec/vulkan/ffv1_enc_reset.comp.glsl b/libavcodec/vulkan/ffv1_enc_reset.comp.glsl index e157923d0a..e708d03036 100644 --- a/libavcodec/vulkan/ffv1_enc_reset.comp.glsl +++ b/libavcodec/vulkan/ffv1_enc_reset.comp.glsl @@ -23,7 +23,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" #include "ffv1_common.glsl" void main(void) diff --git a/libavcodec/vulkan/ffv1_enc_setup.comp.glsl b/libavcodec/vulkan/ffv1_enc_setup.comp.glsl index 68ec6b7b88..53b43e73fc 100644 --- a/libavcodec/vulkan/ffv1_enc_setup.comp.glsl +++ b/libavcodec/vulkan/ffv1_enc_setup.comp.glsl @@ -24,7 +24,7 @@ #extension GL_GOOGLE_include_directive : require #define FULL_RENORM -#include "common.comp" +#include "common.glsl" #include "ffv1_common.glsl" uint8_t state[CONTEXT_SIZE]; diff --git a/libavcodec/vulkan/ffv1_vlc.comp b/libavcodec/vulkan/ffv1_vlc.glsl similarity index 97% rename from libavcodec/vulkan/ffv1_vlc.comp rename to libavcodec/vulkan/ffv1_vlc.glsl index 32a6ca9f37..e1c6cf66de 100644 --- a/libavcodec/vulkan/ffv1_vlc.comp +++ b/libavcodec/vulkan/ffv1_vlc.glsl @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef VULKAN_FFV1_VLC_H +#define VULKAN_FFV1_VLC_H + #define VLC_STATE_SIZE 8 layout(buffer_reference, buffer_reference_align = VLC_STATE_SIZE) buffer VlcState { uint32_t error_sum; @@ -157,3 +160,5 @@ int read_vlc_symbol(inout GetBitContext gb, inout VlcState state, int bits) return ret; } + +#endif /* VULKAN_FFV1_VLC_H */ diff --git a/libavcodec/vulkan/prores_idct.comp.glsl b/libavcodec/vulkan/prores_idct.comp.glsl index 1da19d34e9..b514cb4c77 100644 --- a/libavcodec/vulkan/prores_idct.comp.glsl +++ b/libavcodec/vulkan/prores_idct.comp.glsl @@ -19,7 +19,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" #include "dct.glsl" layout (constant_id = 0) const bool interlaced = false; diff --git a/libavcodec/vulkan/prores_raw_decode.comp.glsl b/libavcodec/vulkan/prores_raw_decode.comp.glsl index e4b00b1440..88687da181 100644 --- a/libavcodec/vulkan/prores_raw_decode.comp.glsl +++ b/libavcodec/vulkan/prores_raw_decode.comp.glsl @@ -23,7 +23,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" struct TileData { ivec2 pos; diff --git a/libavcodec/vulkan/prores_raw_idct.comp.glsl b/libavcodec/vulkan/prores_raw_idct.comp.glsl index 5e3a2fa67c..04fb028055 100644 --- a/libavcodec/vulkan/prores_raw_idct.comp.glsl +++ b/libavcodec/vulkan/prores_raw_idct.comp.glsl @@ -23,7 +23,7 @@ #pragma shader_stage(compute) #extension GL_GOOGLE_include_directive : require -#include "common.comp" +#include "common.glsl" #include "dct.glsl" struct TileData { diff --git a/libavcodec/vulkan/prores_vld.comp.glsl b/libavcodec/vulkan/prores_vld.comp.glsl index 9020d46fa1..b0b17264a4 100644 --- a/libavcodec/vulkan/prores_vld.comp.glsl +++ b/libavcodec/vulkan/prores_vld.comp.glsl @@ -20,7 +20,7 @@ #extension GL_GOOGLE_include_directive : require #define GET_BITS_SMEM 4 -#include "common.comp" +#include "common.glsl" layout (constant_id = 0) const bool interlaced = false; diff --git a/libavcodec/vulkan/rangecoder.comp b/libavcodec/vulkan/rangecoder.glsl similarity index 98% rename from libavcodec/vulkan/rangecoder.comp rename to libavcodec/vulkan/rangecoder.glsl index 7dffaf6c70..9d3eab5461 100644 --- a/libavcodec/vulkan/rangecoder.comp +++ b/libavcodec/vulkan/rangecoder.glsl @@ -20,13 +20,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef CONTEXT_SIZE +#ifndef VULKAN_RANGECODER_H +#define VULKAN_RANGECODER_H + #define CONTEXT_SIZE 32 layout (set = 0, binding = 0, scalar) uniform rangecoder_buf { uint8_t zero_one_state[512]; }; -#endif struct RangeCoder { uint64_t bytestream_start; @@ -247,3 +248,5 @@ bool get_rac_equi(inout RangeCoder c) { return get_rac_internal(c, c.range >> 1); } + +#endif /* VULKAN_RANGECODER_H */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
