[PULL] Megamerge
Adam Jackson
ajax at nwnk.net
Wed Sep 11 11:51:15 PDT 2013
Big old pile of fixes. This includes most of my unifdef ROOTLESS series
(except for the MoveWindowInStack thing, which on second reading was
obviously broken), the reviewed bits of the damage cleanup, the reviewed
parts of the glx series, and the misc fixes from my previous pull
request.
The following changes since commit 47ff382d1fce25a8b097d45b79489e891f1f1228:
Merge remote-tracking branch 'jturney/master' (2013-09-09 15:13:42 -0700)
are available in the git repository at:
ssh://people.freedesktop.org/~ajax/xserver.git xserver-next
for you to fetch changes up to 6ee4d9f94ae2cc27c39381d7554134d9b4807a65:
glx: Fill in some missing attributes from DoGetFBConfigs (2013-09-11 14:37:33 -0400)
----------------------------------------------------------------
Adam Jackson (41):
randr: Fix a copypasta bug in CRTC confinement
os: Factor out some common code in input buffer handling
mipointer: Flatten calls to mieqSwitchScreen
mipointer: Remove EnqueueEvent from miPointerScreenFuncRec
dix: Remove a dead parameter from DoGetImage
dmx: Remove ShadowFB support
damage: Remove the 'damage window' resource type.
dbe: Drop the unused idiom support
dbe: Fold midbe reset into dix
dbe: Fold the window private private into the window private
list: Avoid using X types
dri2: Don't bother with xf86LoaderCheckSymbol("DRI2Connect")
misprite: Delete some dead private storage
vbe: Don't try to load the ddc submodule
dix: FIXES is not optional
xfree86: Remove deprecated unimplemented xf86MapReadSideEffects
mipointer: Remove deprecated miPointerCurrentScreen
fb: Remove unused compatibility wrappers
damage: Implicitly unregister on destroy
damage: Simplify DamageUnregister
damage: Don't rewrite Text ops to GlyphBlt ops
damage: Remove "post-rendering" hooks
damageext: Style fix
dmx/glx: Remove unused __glXNop
glxproxy: Don't track GLCLientm{aj,in}orVersion
glx: Remove unused bits from the context struct
glx: Pull GLX vendor string out of __GLXscreen
glx: Style fixes
glx: Compute number of attributes in GetDrawableAttributes on the fly
glx: Implement GLX_{WIDTH,HEIGHT} in GetDrawableAttributes
glx: Implement GLX_FBCONFIG_ID in GetDrawableAttributes
glx: Implement GLX_PRESERVED_CONTENTS drawable attribute
glx: Handle failure to create the pixmap backing the pbuffer
glx: Eliminate a small malloc from QueryContext
glx: realloc style fix in RenderLarge
glx: Remove support for NV_vertex_program and NV_fragment_program
glx: Remove pixmapMode from __GLXconfig
glx: Remove screen number from __GLXconfig
glx: Catch another failure case in drawable creation
glx: Remove a dead comment
glx: Fill in some missing attributes from DoGetFBConfigs
Chris Wilson (1):
os: Immediately queue initial WriteToClient
Keith Packard (1):
miext/sync: Fix multi-screen support in SyncFence initialization
Laurent Carlier (1):
ephyr: restore GLX support
Michal Srb (1):
Xnest: Implement xnestModifyPixmapHeader
Peter Harris (2):
mi: Avoid stack smash when drawing dashed lines
security: Don't count RetainPermanent clients twice
Radek Doulik (1):
xnest: Ignore GetImage() error in xnestGetImage()
Xext/panoramiX.c | 6 -
Xext/security.c | 11 +-
composite/compalloc.c | 4 +-
damageext/damageext.c | 40 ++----
dbe/Makefile.am | 3 +-
dbe/dbe.c | 81 +----------
dbe/dbestruct.h | 21 ++-
dbe/midbe.c | 126 +++++------------
dbe/midbestr.h | 75 ----------
dix/cursor.c | 6 -
dix/dispatch.c | 88 +++++-------
dix/pixmap.c | 1 -
dix/privates.c | 1 -
dix/window.c | 6 -
exa/exa_classic.c | 1 -
exa/exa_migration_mixed.c | 1 -
exa/exa_mixed.c | 2 -
fb/fb.h | 34 -----
fb/fbcopy.c | 27 ----
glx/glxcmds.c | 103 +++++++++-----
glx/glxcontext.h | 1 -
glx/glxdri2.c | 3 +-
glx/glxext.c | 4 -
glx/glxscreens.c | 17 +--
glx/glxscreens.h | 5 -
hw/dmx/Makefile.am | 2 -
hw/dmx/dmx.h | 4 -
hw/dmx/dmxcursor.c | 2 -
hw/dmx/dmxinit.c | 10 --
hw/dmx/dmxpict.c | 4 -
hw/dmx/dmxscrinit.c | 255 ++++++++++++++--------------------
hw/dmx/dmxshadow.c | 70 ----------
hw/dmx/dmxshadow.h | 46 ------
hw/dmx/glxProxy/Makefile.am | 1 -
hw/dmx/glxProxy/glxcmds.c | 2 -
hw/dmx/glxProxy/glxext.c | 6 -
hw/dmx/glxProxy/glxserver.h | 2 -
hw/dmx/glxProxy/glxutil.c | 37 -----
hw/dmx/glxProxy/glxutil.h | 2 -
hw/dmx/input/dmxbackend.c | 6 +-
hw/dmx/input/dmxcommon.c | 5 -
hw/dmx/man/Xdmx.man | 10 --
hw/kdrive/ephyr/ephyr.c | 5 -
hw/kdrive/ephyr/ephyrinit.c | 20 +++
hw/xfree86/common/xf86Cursor.c | 3 -
hw/xfree86/modes/xf86Rotate.c | 6 +-
hw/xfree86/os-support/shared/vidmem.c | 13 --
hw/xfree86/os-support/xf86OSpriv.h | 2 -
hw/xfree86/os-support/xf86_OSproc.h | 2 -
hw/xfree86/vbe/vbe.c | 17 +--
hw/xnest/GCOps.c | 14 ++
hw/xnest/Pixmap.c | 15 ++
hw/xnest/Screen.c | 1 +
hw/xnest/XNPixmap.h | 2 +
hw/xquartz/GL/glcontextmodes.c | 1 -
hw/xquartz/GL/visualConfigs.c | 1 -
hw/xquartz/xpr/xprCursor.c | 2 -
hw/xwin/glx/indirect.c | 3 -
include/cursorstr.h | 2 -
include/dixstruct.h | 11 --
include/extinit.h | 2 -
include/list.h | 2 +-
include/privates.h | 1 -
mi/miinitext.c | 5 -
mi/mipointer.c | 23 +--
mi/mipointer.h | 12 --
mi/misprite.c | 10 +-
mi/miwideline.c | 6 +-
miext/damage/damage.c | 151 ++++----------------
miext/damage/damage.h | 20 +--
miext/damage/damagestr.h | 3 -
miext/shadow/shadow.c | 2 +-
miext/sync/misync.c | 21 +--
os/io.c | 63 ++++-----
os/utils.c | 2 -
randr/rrpointer.c | 2 +-
76 files changed, 417 insertions(+), 1159 deletions(-)
delete mode 100644 dbe/midbestr.h
delete mode 100644 hw/dmx/dmxshadow.c
delete mode 100644 hw/dmx/dmxshadow.h
delete mode 100644 hw/dmx/glxProxy/glxutil.c
- ajax
More information about the xorg-devel
mailing list