[vlc-devel] [PATCH] egl_pbuffer: add missing call to eglTerminate()

[Alexandre Janniaux]

Actually, there's the same problem with InitEGL when an error
is found after the display has been initialized. Can you fix
it in this commit + add the note on vlc_object_delete too?

Regards,
--
Alexandre Janniaux
Videolabs

On Mon, Mar 22, 2021 at 12:01:59PM +0100, Romain Vimont wrote:
> On Mon, Mar 22, 2021 at 11:57:56AM +0100, Alexandre Janniaux wrote:
> > LGTM, can I add that vlc_object_delete was a stray typo in
> > the commit message?
>
> Sure :)
>
> >
> > Regards,
> > --
> > Alexandre Janniaux
> > Videolabs
> >
> > On Mon, Mar 22, 2021 at 11:50:00AM +0100, Romain Vimont wrote:
> > > The function eglInitialize() was called on open, but eglTerminate() was
> > > not called on close or error.
> > > ---
> > >  modules/video_filter/egl_pbuffer.c | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/modules/video_filter/egl_pbuffer.c b/modules/video_filter/egl_pbuffer.c
> > > index 0ecc2562d0..3ffd6e8e31 100644
> > > --- a/modules/video_filter/egl_pbuffer.c
> > > +++ b/modules/video_filter/egl_pbuffer.c
> > > @@ -352,6 +352,8 @@ static void Close( vlc_gl_t *gl )
> > >      vt->DeleteFramebuffers(BUFFER_COUNT, sys->framebuffers);
> > >      vt->DeleteTextures(BUFFER_COUNT, sys->textures);
> > >      vlc_gl_ReleaseCurrent(sys->gl);
> > > +
> > > +    eglTerminate(sys->display);
> > >  }
> > >
> > >  static int Open(vlc_gl_t *gl, unsigned width, unsigned height)
> > > @@ -446,7 +448,7 @@ static int Open(vlc_gl_t *gl, unsigned width, unsigned height)
> > >      return VLC_SUCCESS;
> > >
> > >  error2:
> > > -    vlc_object_delete(sys->gl);
> > > +    eglTerminate(sys->display);
> > >  error1:
> > >      vlc_obj_free(&gl->obj, sys);
> > >
> > > --
> > > 2.31.0
> > >
> > > _______________________________________________
> > > vlc-devel mailing list
> > > To unsubscribe or modify your subscription options:
> > > https://mailman.videolan.org/listinfo/vlc-devel
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel