[PULL] glamor changes for 1.17

[Keith Packard]

Eric Anholt <eric at anholt.net> writes:

> Eric Anholt (20):
>       xorg: Remove duplicated definitions of some XV-related structs.
>       kdrive: Do a little more cleanup from the XV struct deduplication.
>       kdrive: Remove dead generic XV adaptors code.
>       kdrive: Simplify the adaptor setup interface.
>       glamor: Split the XV code into XF86-dependent parts and generic.
>       kdrive: Mark XV names const to avoid warnings.
>       ephyr: Add support for XV using glamor.
>       glamor: Share code for put_image handling.
>       xephyr: Allow initializing glamor with gles2 (on GLX).
>       glamor: Drop unnecessary glTexParameteri() in SetSpans().
>       glamor: Use MIN/MAX macros to clean up glamor_transfer.c
>       glamor: Drop unnecessary glTexParameteri() in upload of texture data.
>       glamor: Drop constant arguments to glamor_solid().
>       glamor: Remove always-true yInverted flag.
>       glamor: Drop dead get/pub sub pixmap functions.
>       glamor: Drop dead glamor_download_pixmap_to_cpu()
>       glamor: Drop dead glamor_restore_pixmap_to_texture().
>       glamor: Remove a dead prototype.
>       glamor: Drop the "are we doing a series of blits or draws" logic.
>       Merge remote-tracking branch 'origin/master' into glamor-next
>
> Keith Packard (15):
>       ephyr: Deal with non-root visual for window
>       mi: Create miPolylines as a general-purpose line drawing function
>       mi: Make miPolyArc draw fast zero-width when possible
>       mi: Fill spans for multiple arcs in miPolyFillArc
>       mi: Draw multiple lines in one FillSpans call in miZeroLine
>       glamor: Replace fallback preparation code
>       glamor: Directly reference the private key records
>       glamor: Add glamor_program based copy acceleration
>       glamor: Use glamor_program for glamor_push_pixels
>       glamor: Use glamor_program and GL_LINES for 0-width lines
>       glamor: Add glamor_program based 0-width dashed lines
>       glamor: Add accelerated stipple support
>       glamor: Replace glamor_solid_boxes and glamor_solid with GC using code
>       glamor: Remove 'tiling' shader code
>       glamor: Remove stubbed-out glamor_stipple function

Merged.
   55f5bfb..5c2e9fa  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/20140717/2aa68469/attachment-0001.sig>