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

[Eric Anholt]

Here's the stuff I think is ready today.  It's survived XTS and x11perf
-reps 1 -repeat 1 -all on Xephyr, and it's ony my desktop having
survived a normal piglit run.

The following changes since commit e924034269532979f1e88947ee9c33d30461edae:

  glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites. (2014-04-22 09:59:40 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~anholt/xserver glamor-fixes

for you to fetch changes up to a4d96afdbddb7a636df8e336059d3a5624f2e6ae:

  glamor: Fallback to system memory when fail to allocate one big fbo. (2014-04-23 10:41:19 -0700)

----------------------------------------------------------------
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.

 dix/dixutils.c            |  25 +++++++
 glamor/Makefile.am        |   3 +-
 glamor/glamor.c           |  25 +++----
 glamor/glamor_context.h   |   9 +--
 glamor/glamor_copyarea.c  |  18 ++---
 glamor/glamor_core.c      |   9 +--
 glamor/glamor_egl.c       |  61 +++++++---------
 glamor/glamor_fbo.c       |  33 +++++----
 glamor/glamor_fill.c      |  13 ++--
 glamor/glamor_font.c      |   7 +-
 glamor/glamor_getimage.c  |  96 -------------------------
 glamor/glamor_glx.c       |  26 +++----
 glamor/glamor_glyphblt.c  |  10 +--
 glamor/glamor_glyphs.c    |   3 +-
 glamor/glamor_gradient.c  |  24 ++-----
 glamor/glamor_image.c     | 180 ++++++++++++++++++++++++++++++++++++++++++++++
 glamor/glamor_pixmap.c    |  22 ++----
 glamor/glamor_points.c    |   5 +-
 glamor/glamor_priv.h      |  23 +++---
 glamor/glamor_putimage.c  | 161 -----------------------------------------
 glamor/glamor_rects.c     |   4 +-
 glamor/glamor_render.c    |  54 ++++++--------
 glamor/glamor_spans.c     |  10 +--
 glamor/glamor_text.c      |  10 +--
 glamor/glamor_tile.c      |  13 ++--
 glamor/glamor_transfer.c  |   6 +-
 glamor/glamor_trapezoid.c |  20 ++----
 glamor/glamor_utils.h     |  13 ++--
 glamor/glamor_vbo.c       |  17 ++---
 glamor/glamor_xv.c        |   7 +-
 glx/glxcmds.c             |  11 ++-
 glx/glxdri2.c             | 124 +++++++++++++++++++++++---------
 glx/glxdriswrast.c        |  10 +++
 glx/glxext.c              |  27 +++----
 glx/glxserver.h           |   1 -
 include/dix.h             |   2 +
 36 files changed, 478 insertions(+), 604 deletions(-)
 delete mode 100644 glamor/glamor_getimage.c
 create mode 100644 glamor/glamor_image.c
 delete mode 100644 glamor/glamor_putimage.c
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140423/6d8b9480/attachment.sig>