[PULL] glamor fixes, cleanups, and your polypoint.

Eric Anholt eric at anholt.net
Wed Mar 26 13:12:50 PDT 2014


Here's a series for reviewed, ready-to-go glamor code.  I'd been holding
off for a while expecting that someone would review the warning-fixing
revert I sent out, but I removed it in the end so that we can get some
stuff merged.

The following changes since commit bda6fdc71c25b0c3f3747f445103a1995a5713f4:

  Merge remote-tracking branch 'whot/for-keith' (2014-03-25 16:06:03 -0700)

are available in the git repository at:


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

for you to fetch changes up to 1b5d7e78460ed686ba2da398dab341d4867fd4a0:

  glamor: Add glamor_program PolyPoint implementation (2014-03-26 12:58:40 -0700)

----------------------------------------------------------------
Eric Anholt (1):
      kdrive: Remove duplicated definitions of some XV-related structs.

Gaetan Nadon (2):
      ephyr: typo where "()" should be "$()" in the Makefile - breaks make dist
      xfree86: glamor_egl subdir must be distributed - breaks distcheck

Keith Packard (8):
      dix: Allow NULL stipple in ChangeGC
      mi: miPutImage with XYPixmap failed at depth 32 on 64-bit machines
      glamor: Get testing code using small FBOs working again
      glamor: Add bounding box to one-fbo pixmaps
      glamor: Add helper functions to walk pixmap tiling
      glamor: Add infrastructure for generating shaders on the fly
      glamor: Move glamor_poly_segment to separate glamor_segment.c file
      glamor: Add glamor_program PolyPoint implementation

Markus Wick (8):
      glamor: Use glsl "fract/mod" instead of "while" in gradient shaders.
      glamor: Use epoxy_has_gl_extension() instead of rolling our own.
      glamor: Use epoxy_gl_version() instead of rolling our own.
      glamor: Update GL requirements to 2.1.
      glamor: Select VBO path by ARB_mbr extension.
      glamor: Always keep GL_ELEMENT_ARRAY_BUFFER bound to the same IB.
      glamor: Remove unneeded unbindings.
      glamor: Drop feature dependent optimization on startup.

 dix/gc.c                    |   8 +-
 glamor/Makefile.am          |   5 +-
 glamor/glamor.c             |  32 ++--
 glamor/glamor.h             |   7 +
 glamor/glamor_core.c        |  45 -----
 glamor/glamor_fbo.c         |   3 -
 glamor/glamor_fill.c        |   3 -
 glamor/glamor_glyphs.c      |   2 +-
 glamor/glamor_gradient.c    |  60 +------
 glamor/glamor_largepixmap.c |  10 +-
 glamor/glamor_pixmap.c      |  14 +-
 glamor/glamor_points.c      | 129 +++++++++++++++
 glamor/glamor_polyops.c     |  82 ---------
 glamor/glamor_priv.h        |  65 ++++++--
 glamor/glamor_program.c     | 394 ++++++++++++++++++++++++++++++++++++++++++++
 glamor/glamor_program.h     |  94 +++++++++++
 glamor/glamor_render.c      |  29 +---
 glamor/glamor_segment.c     |  39 +++++
 glamor/glamor_transform.c   | 215 ++++++++++++++++++++++++
 glamor/glamor_transform.h   |  87 ++++++++++
 glamor/glamor_trapezoid.c   |   6 -
 glamor/glamor_vbo.c         |   6 +-
 hw/kdrive/ephyr/Makefile.am |   2 +-
 hw/kdrive/ephyr/hostx.c     |   4 +-
 hw/kdrive/src/kxv.c         |  27 +--
 hw/kdrive/src/kxv.h         |  36 +---
 hw/xfree86/Makefile.am      |   2 +-
 mi/mibitblt.c               |   2 +-
 28 files changed, 1080 insertions(+), 328 deletions(-)
 create mode 100644 glamor/glamor_points.c
 delete mode 100644 glamor/glamor_polyops.c
 create mode 100644 glamor/glamor_program.c
 create mode 100644 glamor/glamor_program.h
 create mode 100644 glamor/glamor_segment.c
 create mode 100644 glamor/glamor_transform.c
 create mode 100644 glamor/glamor_transform.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/20140326/954d8b34/attachment.sig>


More information about the xorg-devel mailing list