[PULL] glamor-reformat

[Eric Anholt]

The following changes since commit c1ce807d9f18f215332d7eeb844e8c640f71c53c:

  dix: Praise clients which haven't run for a while, rather than idle clients (2014-01-23 10:10:28 -0800)

are available in the git repository at:

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

for you to fetch changes up to b98e49379c8d7cecce991207048489f51b10028c:

  glamor: Remove more out-of-tree compat code. (2014-01-27 09:30:47 -0800)

----------------------------------------------------------------
Adam Jackson (3):
      glamor: Remove copy of sna's compiler.h
      glamor/egl: Remove glapi awareness
      glamor: Use dix-config.h not project config.h

Eric Anholt (14):
      glamor: Touch up some code so indent doesn't get confused.
      glamor: Apply x-indent.sh.
      glamor: Fix some mangling of shader strings by indent.
      glamor: Fix some indent damage of putting a ' ' after the '*' for pointers.
      glamor: Fix up some indentation damage on header prototypes.
      glamor: Remove compat code for building out of tree.
      glamor: Disable the XV code for now.
      glamor: Drop xfree86 dependencies from this dix module.
      glamor: Disable definitions of GL extension prototypes to avoid warnings.
      glamor: Silence warnings for non-debug builds.
      glamor: Convert use of the old "pointer" typedef to "void *".
      glamor: Hook the module back up to the build.
      glamor: Remove an extra copy of RegionNil().
      glamor: Remove more out-of-tree compat code.

 Makefile.am                               |    6 +
 configure.ac                              |   10 +
 glamor/Makefile.am                        |   36 +-
 glamor/compat-api.h                       |  107 -
 glamor/glamor.c                           |  809 +++----
 glamor/glamor.h                           |  259 +-
 glamor/glamor_addtraps.c                  |   34 +-
 glamor/glamor_compositerects.c            |  458 ++--
 glamor/glamor_copyarea.c                  | 1161 +++++----
 glamor/glamor_copyplane.c                 |   50 +-
 glamor/glamor_copywindow.c                |   34 +-
 glamor/glamor_core.c                      |  827 ++++---
 glamor/glamor_debug.h                     |    9 -
 glamor/glamor_egl.c                       | 1181 +++++----
 glamor/{compiler.h => glamor_egl_stubs.c} |   83 +-
 glamor/glamor_eglmodule.c                 |   24 +-
 glamor/glamor_fbo.c                       |  849 +++----
 glamor/glamor_fill.c                      |  589 +++--
 glamor/glamor_fillspans.c                 |  121 +-
 glamor/glamor_getimage.c                  |   97 +-
 glamor/glamor_getspans.c                  |   91 +-
 glamor/glamor_gl_dispatch.c               |  138 +-
 glamor/glamor_gl_dispatch.h               |  244 +-
 glamor/glamor_glext.h                     |    1 -
 glamor/glamor_glyphblt.c                  |   83 +-
 glamor/glamor_glyphs.c                    | 2945 ++++++++++++-----------
 glamor/glamor_gradient.c                  | 2608 ++++++++++----------
 glamor/glamor_largepixmap.c               | 2429 ++++++++++---------
 glamor/glamor_picture.c                   |  111 +-
 glamor/glamor_pixmap.c                    | 2245 +++++++++--------
 glamor/glamor_polyfillrect.c              |  135 +-
 glamor/glamor_polylines.c                 |  155 +-
 glamor/glamor_polyops.c                   |   43 +-
 glamor/glamor_priv.h                      |  927 ++++---
 glamor/glamor_putimage.c                  |  559 ++---
 glamor/glamor_render.c                    | 3724 ++++++++++++++---------------
 glamor/glamor_setspans.c                  |  119 +-
 glamor/glamor_tile.c                      |  514 ++--
 glamor/glamor_trapezoid.c                 | 3230 ++++++++++++-------------
 glamor/glamor_triangles.c                 |   61 +-
 glamor/glamor_utils.h                     | 1756 +++++++-------
 glamor/glamor_window.c                    |  102 +-
 glamor/glamor_xv.c                        | 1022 ++++----
 glamor/glapi.h                            |  121 -
 include/dix-config.h.in                   |    3 +
 45 files changed, 14938 insertions(+), 15172 deletions(-)
 delete mode 100644 glamor/compat-api.h
 rename glamor/{compiler.h => glamor_egl_stubs.c} (50%)
 delete mode 100644 glamor/glapi.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/20140127/1b8b9861/attachment.pgp>