[PULL] glamor-next

[Eric Anholt]

The following changes since commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56:

  int10: Fix error check for pci_device_map_legacy (2015-03-13 12:31:21 +1000)

are available in the git repository at:

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

for you to fetch changes up to e977b404d7d1c6cd2be2168f4fdce0ae31cd1f9f:

  glamor: * 1/size is faster than / size in VS (2015-03-24 12:43:35 -0700)

----------------------------------------------------------------

This is a bunch of reviewed glamor code.  Some of keithp's never got
sent to the list, and he kept just telling me about the branch's
existence in person.  I reviewed most of it, though one of the middle
patches didn't make sense and crashed on me, so I rebased the rest onto
the series with that one dropped.

Xephyr shows no regressions on Xlib9, and it's running on my desktop.

Adam Jackson (1):
      glamor: Fix up indentation

Eric Anholt (3):
      glamor: Just set the logic op to what we want at the start of all rendering.
      glamor: Don't optimize out scissor updates in CopyArea.
      glamor: Add a helper function for the common GL_QUADS fallback pattern.

Jon TURNEY (2):
      glamor: Fix build when configured --enable-glamor --disable-xshmfence
      ephyr: Avoid a segfault with 'DISPLAY= Xephyr -glamor'

Keith Packard (13):
      glamor: Eliminate GLAMOR_CREATE_PIXMAP_MAP and GLAMOR_MEMORY_MAP
      glamor: Eliminate GLAMOR_USE_SCREEN and GLAMOR_USE_PICTURE_SCREEN
      glamor: Remove _nf rendering functions
      glamor: Remove ddx fallback check functions
      glamor: Eliminate GLAMOR_SEPARATE_TEXTURE pixmap type
      glamor: Eliminate GLAMOR_TEXTURE_PACK pixmap type
      glamor: Remove remaining support for FBOs not matching pixmap size
      glamor: Remove screen private and pixmap ptrs from pixmap private and fbo
      glamor: Remove unused glamor_pixmap_private_atlas_t
      glamor: Eliminate separate 'large' pixmap private structure
      glamor: Create inline tests for small/large pixmaps
      glamor: Eliminate GLAMOR_TEXTURE_LARGE pixmap type
      glamor: * 1/size is faster than / size in VS

Maarten Lankhorst (4):
      glamor: only use (un)pack_subimage when available
      glamor: do not check for gl errors in glamor_build_program
      glamor: Use GL_FRAMEBUFFER instead of GL_READ_FRAMEBUFFER
      glamor: GL_TEXTURE_MAX_LEVEL is not available on GLES2

Matt Turner (1):
      glamor: Perform texture2D() separately from swizzle.

Olivier Fourdan (3):
      ephyr: Fail if glamor is requested but not usable
      xwayland: Add dependency on glamor libs
      glamor: check max native ALU instructions

 glamor/glamor.c                         | 224 ++++++++++++-----------
 glamor/glamor.h                         | 173 +-----------------
 glamor/glamor_addtraps.c                |  29 +--
 glamor/glamor_compositerects.c          |   4 +-
 glamor/glamor_copy.c                    |  75 ++------
 glamor/glamor_core.c                    |  30 ++--
 glamor/glamor_dash.c                    |  15 +-
 glamor/glamor_egl.c                     |  24 ++-
 glamor/glamor_fbo.c                     | 162 +++++++----------
 glamor/glamor_font.c                    |   1 -
 glamor/glamor_glyphblt.c                |  54 +-----
 glamor/glamor_glyphs.c                  |  14 --
 glamor/glamor_gradient.c                |  12 +-
 glamor/glamor_image.c                   |  27 ---
 glamor/glamor_largepixmap.c             | 185 ++++++++++---------
 glamor/glamor_lines.c                   |  23 +--
 glamor/glamor_picture.c                 |  20 +--
 glamor/glamor_pixmap.c                  | 144 +++++----------
 glamor/glamor_points.c                  |  24 +--
 glamor/glamor_prepare.c                 |  40 ++---
 glamor/glamor_priv.h                    | 243 ++++++++++++-------------
 glamor/glamor_program.c                 |  19 +-
 glamor/glamor_program.h                 |   2 +-
 glamor/glamor_rects.c                   |  28 +--
 glamor/glamor_render.c                  | 309 +++++++++++---------------------
 glamor/glamor_segs.c                    |  20 ---
 glamor/glamor_spans.c                   |  61 +------
 glamor/glamor_sync.c                    |   2 +
 glamor/glamor_text.c                    |  47 +----
 glamor/glamor_transfer.c                |  57 +++---
 glamor/glamor_transform.c               |  16 +-
 glamor/glamor_trapezoid.c               |  16 --
 glamor/glamor_triangles.c               |  42 +----
 glamor/glamor_utils.h                   | 215 ++++++++++------------
 glamor/glamor_window.c                  |  12 +-
 glamor/glamor_xv.c                      |  15 +-
 hw/kdrive/ephyr/ephyr_glamor_glx.c      |   2 +
 hw/kdrive/ephyr/hostx.c                 |   9 +-
 hw/xfree86/drivers/modesetting/driver.c |   5 +-
 hw/xwayland/Makefile.am                 |   1 +
 hw/xwayland/xwayland-glamor.c           |   6 +-
 41 files changed, 842 insertions(+), 1565 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20150324/717c37cc/attachment.sig>