[PULL] Reviewed glamor changes

[Eric Anholt]

keithp was saying he was holding the merge window open for a few last
bits of glamor and wayland stuff for 1.16.  This is as far as I was able
to review of keithp's code today.

Note that there are a few squashes of bugfixes to keithp's code that I
wrote and didn't get explicit acks on.  I've also got a couple of
cleanups in my glamor-extra-after-keithp branch.

The following changes since commit 9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3:

  Merge remote-tracking branch 'jturney/master' (2014-03-31 23:24:56 -0700)

are available in the git repository at:


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

for you to fetch changes up to 588a9d02dbed7713da28ecd5239712fa6d39d1c9:

  glamor: Add glamor_program based poly_text and image_text (2014-04-02 15:10:00 -0700)

----------------------------------------------------------------
Eric Anholt (1):
      Revert "glx: Make sure we get an FBConfig the root window's visual."

Keith Packard (14):
      glamor: glamor_poly_point_nf cannot fail for non-DDX pixmaps
      glamor: SetWindowPixmap is not related to RENDER
      glamor: Initialize XV shaders from glamor_xv_init instead of glamor_init
      glamor: Public polyLines function is glamor_poly_lines_nf
      glamor: Remove warning message when pixmap cannot be stored in a texture
      glamor: Bail from composite when pixmap cannot be uploaded
      fb: Publish fbGlyphs and fbUnrealizeGlyph
      glamor: Compute supported GLSL version and save in screen private
      glamor: Use plain GLSL 1.20 features for fill code.
      glamor: Add simple upload/download functions in glamor_transfer
      glamor: Add glamor_program based fill/set/get spans
      glamor: Add glamor_program based poly_fill_rect
      glamor: Use glamor_program for glamor_glyphblt
      glamor: Add glamor_program based poly_text and image_text

 fb/fbpict.c                        |   4 +-
 fb/fbpict.h                        |  15 +-
 glamor/Makefile.am                 |  10 +-
 glamor/glamor.c                    |  24 +-
 glamor/glamor.h                    |  17 +-
 glamor/glamor_core.c               |  14 +-
 glamor/glamor_fillspans.c          | 107 --------
 glamor/glamor_font.c               | 186 +++++++++++++
 glamor/glamor_font.h               |  49 ++++
 glamor/glamor_getspans.c           |  92 -------
 glamor/glamor_glyphblt.c           | 261 ++++++++----------
 glamor/glamor_pixmap.c             |   4 +-
 glamor/glamor_points.c             |  21 +-
 glamor/glamor_polyfillrect.c       | 123 ---------
 glamor/glamor_priv.h               |  68 +++--
 glamor/glamor_program.c            |  17 +-
 glamor/glamor_rects.c              | 189 +++++++++++++
 glamor/glamor_setspans.c           | 118 ---------
 glamor/glamor_spans.c              | 438 ++++++++++++++++++++++++++++++
 glamor/glamor_text.c               | 526 +++++++++++++++++++++++++++++++++++++
 glamor/glamor_transfer.c           | 264 +++++++++++++++++++
 glamor/glamor_transfer.h           |  55 ++++
 glamor/glamor_xv.c                 |  14 +-
 hw/kdrive/ephyr/ephyr_glamor_glx.c |   1 -
 24 files changed, 1947 insertions(+), 670 deletions(-)
 delete mode 100644 glamor/glamor_fillspans.c
 create mode 100644 glamor/glamor_font.c
 create mode 100644 glamor/glamor_font.h
 delete mode 100644 glamor/glamor_getspans.c
 delete mode 100644 glamor/glamor_polyfillrect.c
 create mode 100644 glamor/glamor_rects.c
 delete mode 100644 glamor/glamor_setspans.c
 create mode 100644 glamor/glamor_spans.c
 create mode 100644 glamor/glamor_text.c
 create mode 100644 glamor/glamor_transfer.c
 create mode 100644 glamor/glamor_transfer.h
-------------- 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/20140402/d5494a1f/attachment-0001.sig>