On Fri, Sep 23, 2016 at 04:45:37PM +0300, Hans de Goede wrote: > Hi, > > On 09/23/2016 04:33 PM, Matthieu Herrb wrote: > > Hi > > > > Adam, Keith, any chance to get those 2 patches merged for 1.19 ? > > It would reduce the number of local patches I'm maintaining outside of > > os/os-support. > > > > https://patchwork.freedesktop.org/patch/64866/ > > https://patchwork.freedesktop.org/patch/65081/ > > Both links seem to point to post + re-post of > the same patch, so I see only 1 patch?
You're right. Sorry I mixed up my cut/paste the 2nd one is https://patchwork.freedesktop.org/patch/65444/ But it could be without the renaming. so just: Make glamor_name_from_pixmap work without DRI3 This function is used by the modesetting driver to implement DRI2 and shouldn't fail on systems that don't support DRI3. Remove the check for DRI3 and rename glamor_egl_dri3_fd_name_from_tex to glamor_egl_fd_name_from_tex. diff --git a/glamor/glamor.c b/glamor/glamor.c index 903f6bd..915c8a7 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -848,8 +848,6 @@ glamor_name_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size) glamor_screen_private *glamor_priv = glamor_get_screen_private(pixmap->drawable.pScreen); - if (!glamor_priv->dri3_enabled) - return -1; switch (pixmap_priv->type) { case GLAMOR_TEXTURE_DRM: case GLAMOR_TEXTURE_ONLY: > > The linked to patch LGTM and is: > > Reviewed-by: Hans de Goede <[email protected]> > > Regards, > > Hans -- Matthieu Herrb
signature.asc
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
