Matthieu Herrb <[email protected]> writes: > 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.
Updated commit message wording and fixed the warning: commit 8bb4b11298c285d2cd1eb28e65729933ec386829 Author: Matthieu Herrb <[email protected]> Date: Fri Sep 23 16:56:06 2016 +0300 glamor: 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. v2: Drop stale commit message wording, fix compiler warning (by anholt) Signed-off-by: Eric Anholt <[email protected]> Reviewed-by: Eric Anholt <[email protected]> and merged: To git+ssh://git.freedesktop.org/git/xorg/xserver 128d40b2dd0a..ba199cb90157 HEAD -> master
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
