[FFmpeg-devel] [PATCH 8/8] vulkan: don't enable GL_EXT_buffer_reference by default

Lynne dev at lynne.ee
Thu Oct 3 08:51:35 EEST 2024


Only nlmeans_vulkan uses it.
---
 libavfilter/vf_nlmeans_vulkan.c | 6 ++++--
 libavutil/vulkan.c              | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_nlmeans_vulkan.c b/libavfilter/vf_nlmeans_vulkan.c
index 9ad12eb7b6..39460dc194 100644
--- a/libavfilter/vf_nlmeans_vulkan.c
+++ b/libavfilter/vf_nlmeans_vulkan.c
@@ -240,7 +240,8 @@ static av_cold int init_weights_pipeline(FFVulkanContext *vkctx, FFVkExecPool *e
 
     RET(ff_vk_shader_init(vkctx, shd, "nlmeans_weights",
                           VK_SHADER_STAGE_COMPUTE_BIT,
-                          NULL, 0,
+                          (const char *[]) { "GL_EXT_buffer_reference",
+                                             "GL_EXT_buffer_reference2" }, 2,
                           wg_size, 1, 1,
                           0));
 
@@ -431,7 +432,8 @@ static av_cold int init_denoise_pipeline(FFVulkanContext *vkctx, FFVkExecPool *e
 
     RET(ff_vk_shader_init(vkctx, shd, "nlmeans_denoise",
                           VK_SHADER_STAGE_COMPUTE_BIT,
-                          NULL, 0,
+                          (const char *[]) { "GL_EXT_buffer_reference",
+                                             "GL_EXT_buffer_reference2" }, 2,
                           32, 32, 1,
                           0));
 
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index c6aa6cdd10..46e5cad872 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1479,8 +1479,6 @@ int ff_vk_shader_init(FFVulkanContext *s, FFVulkanShader *shd, const char *name,
     GLSLC(0, #define IS_WITHIN(v1, v2) ((v1.x < v2.x) && (v1.y < v2.y))       );
     GLSLC(0,                                                                  );
     GLSLC(0, #extension GL_EXT_scalar_block_layout : require                  );
-    GLSLC(0, #extension GL_EXT_buffer_reference : require                     );
-    GLSLC(0, #extension GL_EXT_buffer_reference2 : require                    );
 
     if (stage == VK_SHADER_STAGE_TASK_BIT_EXT ||
         stage == VK_SHADER_STAGE_MESH_BIT_EXT)
-- 
2.45.2.753.g447d99e1c3b


More information about the ffmpeg-devel mailing list