[PULL] glamor megaseries

[Eric Anholt]

Here are the changes from the glamor megaseries I sent, reviewed by
Markus and Keith, plus a couple of changes I picked up off the list and
reviewed myself.

The following changes since commit 96a28e9c914d7ae9b269f73a27b99cbd3c465ac8:

  glx: Clear new FBConfig attributes to 0 by default. (2014-03-10 13:57:21 -0700)

are available in the git repository at:

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

for you to fetch changes up to 6649d0059e1bc136b84a9e457ae81c07521fadc0:

  glamor: Move up glamor_priv->flags assignment in glamor_init() (2014-03-17 14:43:28 -0700)

----------------------------------------------------------------
Alan Coopersmith (1):
      Remove duplicate assignment of repeat_type_uniform_location

Eric Anholt (29):
      xephyr: Don't forget to glViewport() before drawing the screen.
      glamor: Drop the set of the context to NULL at the end of glamor ops.
      glamor: Use epoxy_has_egl_extension() instead of rolling our own.
      glamor: Move the EGL image to the normal pixmap private.
      glamor: Do glyph private init at screeninit time, and other stuff at CSR.
      sync: Add a header include necessary to use misyncstr.h
      glamor: Drop the body of the function for enabling DRI3 extensions.
      glamor: Return the stride/size for glamor_dri3_name_from_pixmap(), too.
      glamor: Drop duplicated lines for getting pixmap state in GetImage.
      glamor: Fix stack overflow in glamor_solid vertex handling.
      glamor: Drop bogus _X_UNLIKELY.
      glamor: Fix some integer overflow errors.
      glamor: Rename a variable to be more descriptive.
      glamor: Rename more solid fill variables to clean up the code.
      glamor: Fix up doxygen for glamor_fill.c.
      glamor: Replace some goofy enum-likes with a real enum.
      glamor: Drop stale comment.
      glamor: Drop unused GLAMOR_ACCESS_WO.
      glamor: Allow nested mapping of pixmaps.
      glamor: Rely on nested mappings to handle src==dst and !prepare bugs.
      glamor: Add missing prepares on the GC during fb fallbacks.
      glamor: Improve the performance of PushPixels by, well, pushing pixels.
      glamor: Improve the performance of PolyGlyphBlt.
      glamor: Improve the performance of line fallbacks.
      glamor: Fix ignoring the ALU during SetSpans().
      glamor: Add an assert about an invariant the upload code relies on.
      glamor: Don't forget to unmap our PBOs before using them to upload.
      glamor: Apply debug labels to our shaders.
      glx: Make sure we get an FBConfig the root window's visual.

Markus Wick (2):
      glamor: remove disabled code
      glamor: don't reset the GLSL program

Michel Dänzer (1):
      glamor: Move up glamor_priv->flags assignment in glamor_init()

 glamor/glamor.c                    |  37 +++++-
 glamor/glamor.h                    |  19 +--
 glamor/glamor_addtraps.c           |   2 +-
 glamor/glamor_copyarea.c           |  19 ++-
 glamor/glamor_copyplane.c          |  15 ++-
 glamor/glamor_core.c               |  65 +++++++---
 glamor/glamor_egl.c                | 129 ++++++++-----------
 glamor/glamor_fbo.c                |   2 +-
 glamor/glamor_fill.c               |  74 ++++++-----
 glamor/glamor_fillspans.c          |  11 +-
 glamor/glamor_getimage.c           |   2 -
 glamor/glamor_getspans.c           |   2 +-
 glamor/glamor_glx.c                |   8 +-
 glamor/glamor_glyphblt.c           | 251 +++++++++++++++++++++++++++++++++++++
 glamor/glamor_glyphs.c             |  21 ++--
 glamor/glamor_gradient.c           |  14 +--
 glamor/glamor_picture.c            |   4 +-
 glamor/glamor_pixmap.c             |  20 +--
 glamor/glamor_polyfillrect.c       |  11 +-
 glamor/glamor_polylines.c          |  28 ++---
 glamor/glamor_priv.h               |  56 ++++++---
 glamor/glamor_putimage.c           | 197 -----------------------------
 glamor/glamor_render.c             |  38 +++---
 glamor/glamor_setspans.c           |  12 +-
 glamor/glamor_tile.c               |   4 +-
 glamor/glamor_trapezoid.c          |   6 +-
 glamor/glamor_triangles.c          |  15 +--
 glamor/glamor_utils.h              |  33 +++--
 glamor/glamor_xv.c                 |   3 +-
 hw/kdrive/ephyr/ephyr_glamor_glx.c |  16 +++
 hw/kdrive/ephyr/ephyr_glamor_glx.h |  10 ++
 hw/kdrive/ephyr/hostx.c            |   7 +-
 miext/sync/misyncstr.h             |   1 +
 33 files changed, 616 insertions(+), 516 deletions(-)
-------------- 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/20140317/e0cd2d0a/attachment.sig>