| Message ID | 20211118042449.8038-5-jianhua.wu@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,01/10] avfilter/avgblur_vulkan: check if shader is created with success | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
Nov 18, 2021, 05:24 by jianhua.wu@intel.com: > Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> > --- > libavfilter/vf_overlay_vulkan.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c > index b902ad83f5..29eb11c89d 100644 > --- a/libavfilter/vf_overlay_vulkan.c > +++ b/libavfilter/vf_overlay_vulkan.c > @@ -145,7 +145,7 @@ static av_cold int init_filter(AVFilterContext *ctx) > > ff_vk_set_compute_shader_sizes(ctx, shd, CGROUPS); > > - RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, 3, 0)); /* set 0 */ > + RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, FF_ARRAY_ELEMS(desc_i), 0)); /* set 0 */ > RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, &desc_b, 1, 0)); /* set 1 */ > > GLSLD( overlay_noalpha ); > Thanks for all the patches, but it's getting difficult for me to maintain my Vulkan hwaccel branch with all changes. Would you mind waiting a bit for me to push the patch I just submitted and then rebasing all the patches you submitted?
> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of > Lynne > Sent: Thursday, November 18, 2021 1:48 PM > To: FFmpeg development discussions and patches <ffmpeg- > devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH 05/10] avfilter/overlay_vulkan: use > FF_ARRAY_ELEMS instead of magic number > > Nov 18, 2021, 05:24 by jianhua.wu@intel.com: > > > Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> > > --- > > libavfilter/vf_overlay_vulkan.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavfilter/vf_overlay_vulkan.c > > b/libavfilter/vf_overlay_vulkan.c index b902ad83f5..29eb11c89d 100644 > > --- a/libavfilter/vf_overlay_vulkan.c > > +++ b/libavfilter/vf_overlay_vulkan.c > > @@ -145,7 +145,7 @@ static av_cold int init_filter(AVFilterContext > > *ctx) > > > > ff_vk_set_compute_shader_sizes(ctx, shd, CGROUPS); > > > > - RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, 3, 0)); /* set 0 > */ > > + RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, > > + FF_ARRAY_ELEMS(desc_i), 0)); /* set 0 */ > > RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, &desc_b, 1, 0)); /* set > > 1 */ > > > > GLSLD( overlay_noalpha ); > > > > Thanks for all the patches, but it's getting difficult for me to maintain my > Vulkan hwaccel branch with all changes. Would you mind waiting a bit for me > to push the patch I just submitted and then rebasing all the patches you > submitted? > > It's okay. Take your time.
18 Nov 2021, 06:48 by dev@lynne.ee: > Nov 18, 2021, 05:24 by jianhua.wu@intel.com: > >> Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> >> --- >> libavfilter/vf_overlay_vulkan.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c >> index b902ad83f5..29eb11c89d 100644 >> --- a/libavfilter/vf_overlay_vulkan.c >> +++ b/libavfilter/vf_overlay_vulkan.c >> @@ -145,7 +145,7 @@ static av_cold int init_filter(AVFilterContext *ctx) >> >> ff_vk_set_compute_shader_sizes(ctx, shd, CGROUPS); >> >> - RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, 3, 0)); /* set 0 */ >> + RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, FF_ARRAY_ELEMS(desc_i), 0)); /* set 0 */ >> RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, &desc_b, 1, 0)); /* set 1 */ >> >> GLSLD( overlay_noalpha ); >> > > Thanks for all the patches, but it's getting difficult for me to maintain > my Vulkan hwaccel branch with all changes. Would you mind waiting > a bit for me to push the patch I just submitted and then rebasing all the > patches you submitted? > I pushed my patches, could you rebase all of your patches and fixes and resend them?
Lynne: > Sent: Friday, November 19, 2021 8:55 PM > To: FFmpeg development discussions and patches <ffmpeg- > devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH 05/10] avfilter/overlay_vulkan: use > FF_ARRAY_ELEMS instead of magic number > > 18 Nov 2021, 06:48 by dev@lynne.ee: > > > Nov 18, 2021, 05:24 by jianhua.wu@intel.com: > > > >> Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> > >> --- > >> libavfilter/vf_overlay_vulkan.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/libavfilter/vf_overlay_vulkan.c > >> b/libavfilter/vf_overlay_vulkan.c index b902ad83f5..29eb11c89d 100644 > >> --- a/libavfilter/vf_overlay_vulkan.c > >> +++ b/libavfilter/vf_overlay_vulkan.c > >> @@ -145,7 +145,7 @@ static av_cold int init_filter(AVFilterContext > >> *ctx) > >> > >> ff_vk_set_compute_shader_sizes(ctx, shd, CGROUPS); > >> > >> - RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, 3, 0)); /* set 0 > */ > >> + RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, > >> + FF_ARRAY_ELEMS(desc_i), 0)); /* set 0 */ > >> RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, &desc_b, 1, 0)); /* > >> set 1 */ > >> > >> GLSLD( overlay_noalpha ); > >> > > > > Thanks for all the patches, but it's getting difficult for me to > > maintain my Vulkan hwaccel branch with all changes. Would you mind > > waiting a bit for me to push the patch I just submitted and then > > rebasing all the patches you submitted? > > > > I pushed my patches, could you rebase all of your patches and fixes and > resend them? > Sure thing. I'll update later.
diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c index b902ad83f5..29eb11c89d 100644 --- a/libavfilter/vf_overlay_vulkan.c +++ b/libavfilter/vf_overlay_vulkan.c @@ -145,7 +145,7 @@ static av_cold int init_filter(AVFilterContext *ctx) ff_vk_set_compute_shader_sizes(ctx, shd, CGROUPS); - RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, 3, 0)); /* set 0 */ + RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, desc_i, FF_ARRAY_ELEMS(desc_i), 0)); /* set 0 */ RET(ff_vk_add_descriptor_set(ctx, s->pl, shd, &desc_b, 1, 0)); /* set 1 */ GLSLD( overlay_noalpha );
Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> --- libavfilter/vf_overlay_vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)