[PULL] glamor-fixes (indirect GLX, get_image, port from external)

[Keith Packard]

Eric Anholt <eric at anholt.net> writes:

> Anthony Waters (1):
>       glamor: Fix coordinates handling for composite source/mask pictures
>
> Eric Anholt (12):
>       glamor: Fix a missing set of the GL context.
>       glx: Move the GLX variable caching what GL context is current to dix.
>       glx: Move GLX MakeCurrent lastGLContext updates next to makeCurrent().
>       glx: Unconditionally clear lastGLContext on loseCurrent().
>       glx: Refactor DRI2CopyRegion calls.
>       glx: Make sure that DRI2/swrast calls haven't changed the GL context.
>       glamor: Use lastGLContext to coordinate the context with GLX.
>       glamor: Stop unsetting the EGL context in put_context().
>       glamor: Replace glamor_get/put_context() with just glamor_make_current().
>       glamor: Explain the weird EGL_NO_CONTEXT code.
>       glamor: Do the same MakeCurrent(None) for GLX as we do for EGL.
>       glamor: Move a make_current before the first GL call entrypoint.
>
> Keith Packard (2):
>       glamor: Wire alpha to 1 for pictures without alpha bits
>       glamor: Add glamor_transfer based glamor_get_image and glamor_put_image
>
> Michel Dänzer (2):
>       glx: If DRI2GetBuffers changes the GL context, call it again
>       glamor: Fix memory leak in _glamor_copy_n_to_n()
>
> Zhigang Gong (1):
>       glamor: Fallback to system memory when fail to allocate one big fbo.

Merged.
   e924034..a4d96af  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140423/c76c0b0b/attachment.sig>