[PULL] build fix, GC clipping cleanup

Jamey Sharp jamey at minilop.net
Mon Oct 3 23:46:10 PDT 2011


On Mon, Oct 03, 2011 at 03:13:09PM -0700, Jamey Sharp wrote:
> On Mon, Oct 03, 2011 at 12:01:23PM -0700, Keith Packard wrote:
> > On Wed, 28 Sep 2011 13:57:27 -0700, Jamey Sharp <jamey at minilop.net> wrote:
> > > Hi Keith! Here's some reviewed code deletion (hooray!) and the fix to
> > > make kdrive build again after the last pull.
> > 
> > There was a comment requesting that FreePixmap be renamed
> > 'UnreferencePixmap' or some such?
> 
> Yeah, and I'm not opposed. (Although I'm hoping for a better name
> choice...) It's probably a good idea to change the names anyway so any
> unfixed callers are detected at compile time.
> 
> Would you pull the rest of my reviewed patches in the meantime though? I
> have a lot of patches that depend on the clipping changes going in, and
> the missing .gitignore entry keeps bugging me.

And now, with that fixed and review tags updated, please pull the whole
thing:

The following changes since commit 6378d0233d21088b6429755627b4253859892c72:

  Merge remote-tracking branch 'herrb/master' (2011-10-03 13:56:06 -0700)

are available in the git repository at:

  git://anongit.freedesktop.org/~jamey/xserver reviewed

Jamey Sharp (6):
      test: .gitignore the binary for xfree86.c.
      Quit wrapping ChangeClip, CopyClip, and DestroyClip in GCFuncs.
      Make GC clientClip always be a region.
      Introduce ReleasePixmap to unreference, call screen hooks, and free.
      Introduce CreatePixmap, allocating a header and calling screen hooks.
      Move pixmap size limit checking to CreatePixmap, from screen hooks.

 Xext/panoramiX.c                       |   32 ------
 Xext/saver.c                           |    4 +-
 Xext/shm.c                             |   34 +++----
 Xext/xvmain.c                          |   10 +--
 composite/compalloc.c                  |    6 +-
 composite/compwindow.c                 |    7 +-
 dbe/midbe.c                            |   42 +++-----
 dix/dispatch.c                         |   12 +--
 dix/gc.c                               |   89 ++++++++++++-----
 dix/glyphcurs.c                        |    8 +-
 dix/pixmap.c                           |   55 +++++++----
 dix/window.c                           |   21 ++--
 doc/Xserver-spec.xml                   |  119 +++-------------------
 exa/exa.c                              |   48 ---------
 exa/exa_accel.c                        |   18 ++--
 exa/exa_classic.c                      |   70 ++++++-------
 exa/exa_driver.c                       |   50 ++++------
 exa/exa_glyphs.c                       |   20 ++---
 exa/exa_mixed.c                        |   56 +++++------
 exa/exa_offscreen.c                    |    4 +-
 exa/exa_priv.h                         |   27 +++---
 exa/exa_render.c                       |    7 +-
 exa/exa_unaccel.c                      |    6 +-
 fb/fb.h                                |   12 +--
 fb/fb24_32.c                           |    2 +-
 fb/fbgc.c                              |    7 +-
 fb/fboverlay.c                         |    4 +-
 fb/fbpixmap.c                          |   67 +++----------
 fb/fbwindow.c                          |    2 +-
 glx/glxcmds.c                          |    3 +-
 hw/dmx/dmxgc.c                         |  115 +++++++---------------
 hw/dmx/dmxgc.h                         |    3 -
 hw/dmx/dmxpixmap.c                     |   42 ++-------
 hw/dmx/dmxpixmap.h                     |    6 +-
 hw/dmx/glxProxy/glxext.c               |    4 +-
 hw/kdrive/src/kxv.c                    |    2 +-
 hw/xfree86/common/xf86DGA.c            |    6 +-
 hw/xfree86/common/xf86VGAarbiter.c     |   42 ++-------
 hw/xfree86/common/xf86VGAarbiterPriv.h |    7 +-
 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/xfree86/xaa/xaaInit.c               |   99 +++++++++----------
 hw/xnest/GC.c                          |  170 +++++---------------------------
 hw/xnest/Pixmap.c                      |   40 ++------
 hw/xnest/XNGC.h                        |    4 -
 hw/xnest/XNPixmap.h                    |    5 +-
 hw/xwin/win.h                          |    5 +-
 hw/xwin/wingc.c                        |   42 --------
 hw/xwin/winpixmap.c                    |   51 +++-------
 include/gc.h                           |    2 +-
 include/gcstruct.h                     |   25 ++---
 include/pixmap.h                       |    9 +-
 include/scrnintstr.h                   |   10 +--
 mi/miarc.c                             |    9 +-
 mi/mibitblt.c                          |   18 ++--
 mi/micopy.c                            |    4 +-
 mi/midispcur.c                         |   26 +++---
 mi/miexpose.c                          |    2 +-
 mi/migc.c                              |   76 +--------------
 mi/migc.h                              |   16 ---
 mi/miglblt.c                           |   10 +-
 mi/mioverlay.c                         |    2 +-
 mi/miscrinit.c                         |    5 +-
 miext/cw/cw.c                          |   52 +---------
 miext/damage/damage.c                  |   51 ++--------
 miext/rootless/rootlessGC.c            |   29 ------
 miext/rootless/rootlessScreen.c        |    2 +-
 miext/shadow/shadow.c                  |    6 +-
 render/glyph.c                         |    8 +-
 render/mipict.c                        |    4 +-
 render/mirect.c                        |    7 +-
 render/picture.c                       |    2 +-
 render/render.c                        |   11 +--
 test/.gitignore                        |    1 +
 xfixes/region.c                        |   27 ++----
 77 files changed, 563 insertions(+), 1408 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/20111003/69e064d4/attachment.pgp>


More information about the xorg-devel mailing list