[PULL] GC clipping cleanup

[Jamey Sharp]

On Mon, Oct 17, 2011 at 02:06:55PM -0700, Keith Packard wrote:
> On Wed, 5 Oct 2011 08:30:56 -0700, Jamey Sharp <jamey at minilop.net> wrote:
> > Alright, the pixmap hooks have weird undocumented constraints, and
> > maybe we'll figure out something clever someday. Meanwhile, would you
> > please merge the other three commits?
> 
> For other ABI changes like this, we've provided compile-time tests you
> can use to switch the code without using the X server ABI version
> information. That way, it's easy to make video drivers compile across
> the change.
> 
> The hardest part will be picking a suitable name which makes the
> difference reasonably clear.
> 
> Otherwise, these changes look good to me; fixing the driver to handle
> the change was straightforward.

Oh. The merge window isn't closed yet? Huh.

I've added a video ABI bump to the second of the two commits. That will
do, I hope?

The following changes since commit f7ea7a324520844beaac8be7503ac50e20da5ab1:

  configure: split the required modules up (2011-12-14 11:48:14 -0800)

are available in the git repository at:
  git://anongit.freedesktop.org/~jamey/xserver cleanup-gcclip

Jamey Sharp (2):
      Quit wrapping ChangeClip, CopyClip, and DestroyClip in GCFuncs.
      Make GC clientClip always be a region, and bump video ABI to 13.

 Xext/panoramiX.c                       |   32 ------
 dix/gc.c                               |   64 ++++++++++---
 doc/Xserver-spec.xml                   |   76 +--------------
 exa/exa.c                              |   48 ---------
 exa/exa_accel.c                        |   18 ++--
 exa/exa_priv.h                         |    6 +-
 exa/exa_unaccel.c                      |    6 +-
 fb/fbgc.c                              |    3 -
 hw/dmx/dmxgc.c                         |  115 +++++++---------------
 hw/dmx/dmxgc.h                         |    3 -
 hw/kdrive/src/kxv.c                    |    2 +-
 hw/xfree86/common/xf86Module.h         |    2 +-
 hw/xfree86/common/xf86VGAarbiter.c     |   31 +------
 hw/xfree86/common/xf86VGAarbiterPriv.h |    4 -
 hw/xfree86/common/xf86xv.c             |    2 +-
 hw/xfree86/shadowfb/shadow.c           |   35 -------
 hw/xfree86/xaa/xaaBitBlt.c             |    4 +-
 hw/xfree86/xaa/xaaGC.c                 |   31 ------
 hw/xnest/GC.c                          |  170 +++++---------------------------
 hw/xnest/XNGC.h                        |    4 -
 hw/xwin/wingc.c                        |   42 --------
 include/gc.h                           |    2 +-
 include/gcstruct.h                     |   25 ++---
 mi/mibitblt.c                          |    4 +-
 mi/micopy.c                            |    4 +-
 mi/miexpose.c                          |    2 +-
 mi/migc.c                              |   74 +--------------
 mi/migc.h                              |   16 ---
 mi/mioverlay.c                         |    2 +-
 miext/cw/cw.c                          |   52 +---------
 miext/damage/damage.c                  |   31 ------
 miext/rootless/rootlessGC.c            |   29 ------
 render/mirect.c                        |    2 +-
 xfixes/region.c                        |   27 ++----
 34 files changed, 164 insertions(+), 804 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111214/363ea329/attachment.pgp>