[FFmpeg-devel] [PATCH 1/2] avgblur_vulkan: fix duplicated variable error when planes=0

[FFmpeg-devel] [PATCH 1/2] avgblur_vulkan: fix duplicated variable error when planes=0

[Lynne]

---
 libavfilter/vf_avgblur_vulkan.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c
index 5a7012531b..156278dd78 100644
--- a/libavfilter/vf_avgblur_vulkan.c
+++ b/libavfilter/vf_avgblur_vulkan.c
@@ -127,6 +127,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
     GLSLC(0, void main()                                                  );
     GLSLC(0, {                                                            );
     GLSLC(1,     ivec2 size;                                              );
+    GLSLC(1,     vec4 res;                                                );
     GLSLC(1,     const ivec2 pos = ivec2(gl_GlobalInvocationID.xy);       );
     for (int i = 0; i < planes; i++) {
         GLSLC(0,                                                          );
@@ -136,7 +137,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in)
         if (s->planes & (1 << i)) {
             GLSLF(1, distort(pos, %i);                                  ,i);
         } else {
-            GLSLF(1, vec4 res = imageLoad(input_img[%i], pos);          ,i);
+            GLSLF(1, res = imageLoad(input_img[%i], pos);               ,i);
             GLSLF(1, imageStore(output_img[%i], pos, res);              ,i);
         }
     }
-- 
2.47.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] vulkan: fix crash in ff_vk_shader_free

[Lynne]

The issue is if a shader fails to compile, shd->desc_layout would
not exist, but nb_descriptor_sets would.
---
 libavutil/vulkan.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index d3ada59334..a868a3b90d 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -2595,10 +2595,12 @@ void ff_vk_shader_free(FFVulkanContext *s, FFVulkanShader *shd)
         av_free(set->binding_offset);
     }
 
-    for (int i = 0; i < shd->nb_descriptor_sets; i++)
-        if (shd->desc_layout[i])
-            vk->DestroyDescriptorSetLayout(s->hwctx->act_dev, shd->desc_layout[i],
-                                           s->hwctx->alloc);
+    if (shd->desc_layout) {
+        for (int i = 0; i < shd->nb_descriptor_sets; i++)
+            if (shd->desc_layout[i])
+                vk->DestroyDescriptorSetLayout(s->hwctx->act_dev, shd->desc_layout[i],
+                                               s->hwctx->alloc);
+    }
 
     av_freep(&shd->desc_pool_size);
     av_freep(&shd->desc_layout);
-- 
2.47.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".