On 14/07/17 04:04 AM, Emil Velikov wrote: > From: Emil Velikov <[email protected]> > > Earlier commit refactored/split the parsing into separate hunks. > While no functional change was intended, it did not attribute that > different error is set when the attrib. value is incorrect. > > Fixes: 3ee2be4113d ("egl: split _eglParseImageAttribList into per > extension functions") > Cc: Michel Dänzer <[email protected]> > Reported-by: Michel Dänzer <[email protected]> > Signed-off-by: Emil Velikov <[email protected]> > --- > There's at least one other way (tad longer and more extensive) way to > address this. Considering no other extensions bother with separate > error, that may be an overkill... for now. > --- > src/egl/main/eglimage.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/src/egl/main/eglimage.c b/src/egl/main/eglimage.c > index a96075fe558..72a556e8dbd 100644 > --- a/src/egl/main/eglimage.c > +++ b/src/egl/main/eglimage.c > @@ -302,6 +302,13 @@ _eglParseImageAttribList(_EGLImageAttribs *attrs, > _EGLDisplay *dpy, > if (err == EGL_SUCCESS) > continue; > > + /* EXT_image_dma_buf_import states that if invalid value is provided > for > + * its attributes, we should return EGL_BAD_ATTRIBUTE. > + * Bail out ASAP, since follow-up calls can return another EGL_BAD > error. > + */ > + if (err == EGL_BAD_ATTRIBUTE) > + return _eglError(err, __func__); > + > err = _eglParseEXTImageDmaBufImportModifiersAttribs(attrs, dpy, attr, > val); > if (err == EGL_SUCCESS) > continue; >
Tested-by: Michel Dänzer <[email protected]> Thanks! -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
