[PULL] glamor changes for 1.17
Boyan Ding
stu_dby at 126.com
Sun Jul 27 00:33:18 PDT 2014
Hi,
This commit:
glamor: Add glamor_program based copy acceleration
seems to cause problem with Xwayland with glamor, bug report at
https://bugs.freedesktop.org/show_bug.cgi?id=81800
Regards,
Boyan Ding
On Thu, 2014-07-17 at 18:08 -0700, Eric Anholt wrote:
> The following changes since commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7:
>
> glamor: Fix temp picture coordinates in glamor_composite_clipped_region (2014-07-17 16:20:12 -0700)
>
> are available in the git repository at:
>
> git://people.freedesktop.org/~anholt/xserver glamor-next
>
> for you to fetch changes up to 6d4954884908ea9894fcfe9836db1ba7bb45be61:
>
> Merge remote-tracking branch 'origin/master' into glamor-next (2014-07-17 18:07:26 -0700)
>
> ----------------------------------------------------------------
>
> 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
>
> glamor/Makefile.am | 15 +-
> glamor/glamor.c | 49 +-
> glamor/glamor.h | 23 +-
> glamor/glamor_copy.c | 693 ++++++++++++++++++++++++++
> glamor/glamor_copyarea.c | 626 -----------------------
> glamor/glamor_copyplane.c | 75 ---
> glamor/glamor_copywindow.c | 56 ---
> glamor/glamor_core.c | 202 ++++----
> glamor/glamor_dash.c | 370 ++++++++++++++
> glamor/glamor_fill.c | 356 -------------
> glamor/glamor_glyphblt.c | 154 +++---
> glamor/glamor_glyphs.c | 10 +-
> glamor/glamor_gradient.c | 19 +-
> glamor/glamor_largepixmap.c | 13 +-
> glamor/glamor_lines.c | 187 +++++++
> glamor/glamor_picture.c | 18 -
> glamor/glamor_pixmap.c | 509 +------------------
> glamor/glamor_points.c | 3 -
> glamor/glamor_polylines.c | 136 -----
> glamor/glamor_prepare.c | 274 ++++++++++
> glamor/{glamor_segment.c => glamor_prepare.h} | 40 +-
> glamor/glamor_priv.h | 251 +++++-----
> glamor/glamor_program.c | 56 ++-
> glamor/glamor_program.h | 6 +
> glamor/glamor_render.c | 89 +---
> glamor/glamor_segs.c | 188 +++++++
> glamor/glamor_spans.c | 3 -
> glamor/glamor_text.c | 6 -
> glamor/glamor_tile.c | 293 -----------
> glamor/glamor_transfer.c | 48 +-
> glamor/glamor_transform.c | 72 ++-
> glamor/glamor_trapezoid.c | 22 +-
> glamor/glamor_utils.c | 79 +++
> glamor/glamor_utils.h | 218 +++-----
> glamor/glamor_xv.c | 265 ++++------
> hw/kdrive/ephyr/Makefile.am | 5 +
> hw/kdrive/ephyr/ephyr.c | 4 +-
> hw/kdrive/ephyr/ephyr.h | 10 +
> hw/kdrive/ephyr/ephyr_glamor_glx.c | 24 +-
> hw/kdrive/ephyr/ephyr_glamor_xv.c | 161 ++++++
> hw/kdrive/ephyr/ephyrinit.c | 12 +-
> hw/kdrive/ephyr/ephyrvideo.c | 34 +-
> hw/kdrive/ephyr/hostx.c | 34 +-
> hw/kdrive/src/kxv.c | 81 +--
> hw/kdrive/src/kxv.h | 23 +-
> hw/xfree86/common/xf86xv.c | 53 +-
> hw/xfree86/common/xf86xv.h | 36 +-
> hw/xfree86/glamor_egl/Makefile.am | 3 +-
> hw/xfree86/glamor_egl/glamor_xf86_xv.c | 185 +++++++
> mi/mi.h | 11 +
> mi/miarc.c | 11 +-
> mi/mifillarc.c | 146 +++---
> mi/miwideline.c | 20 +
> mi/mizerarc.c | 2 +-
> mi/mizerline.c | 16 +-
> 55 files changed, 3053 insertions(+), 3242 deletions(-)
> create mode 100644 glamor/glamor_copy.c
> delete mode 100644 glamor/glamor_copyarea.c
> delete mode 100644 glamor/glamor_copyplane.c
> delete mode 100644 glamor/glamor_copywindow.c
> create mode 100644 glamor/glamor_dash.c
> delete mode 100644 glamor/glamor_fill.c
> create mode 100644 glamor/glamor_lines.c
> delete mode 100644 glamor/glamor_polylines.c
> create mode 100644 glamor/glamor_prepare.c
> rename glamor/{glamor_segment.c => glamor_prepare.h} (63%)
> create mode 100644 glamor/glamor_segs.c
> delete mode 100644 glamor/glamor_tile.c
> create mode 100644 glamor/glamor_utils.c
> create mode 100644 hw/kdrive/ephyr/ephyr_glamor_xv.c
> create mode 100644 hw/xfree86/glamor_egl/glamor_xf86_xv.c
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
More information about the xorg-devel
mailing list