[PULL] glamor-reformat

[Keith Packard]

Eric Anholt <eric at anholt.net> writes:

> 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.

Merged (there was a trivial conflict in Makefile.am):
   7ddef4f..0fbb3d7  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/20140127/f60ec5cc/attachment.pgp>