diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-28 07:25:21 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-28 07:25:21 -0400 |
| commit | 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 (patch) | |
| tree | 2e720a9d55fe3cf65e735c8ce66866fb8c749d18 /hw/xfree86/xaa/xaaStateChange.c | |
| parent | 860a09cfb8afc0a293c7eb5e01762724eb86847a (diff) | |
| parent | 7d54399cfdaa7f54e28828267a76b89c4e8e798f (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
Diffstat (limited to 'hw/xfree86/xaa/xaaStateChange.c')
| -rw-r--r-- | hw/xfree86/xaa/xaaStateChange.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index a614fe28c..711f7791f 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -262,8 +262,6 @@ typedef struct _XAAStateWrapRec { PaintWindowBackgroundProcPtr PaintWindowBackground; PaintWindowBorderProcPtr PaintWindowBorder; CopyWindowProcPtr CopyWindow; - BackingStoreSaveAreasProcPtr SaveAreas; - BackingStoreRestoreAreasProcPtr RestoreAreas; #ifdef RENDER Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op, CARD16 red, CARD16 green, @@ -1481,26 +1479,6 @@ static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, prgnSrc); } -static void XAAStateWrapSaveAreas(PixmapPtr pBackingPixmap, RegionPtr pObscured, int x, - int y, WindowPtr pWin) -{ - GET_STATEPRIV_SCREEN(pBackingPixmap->drawable.pScreen); - STATE_CHECK_SP(pStatePriv); - - (*pStatePriv->SaveAreas)(pBackingPixmap, pObscured, x, - y, pWin); -} - -static void XAAStateWrapRestoreAreas(PixmapPtr pBackingPixmap, RegionPtr pExposed, - int x, int y, WindowPtr pWin) -{ - GET_STATEPRIV_SCREEN(pBackingPixmap->drawable.pScreen); - STATE_CHECK_SP(pStatePriv); - - (*pStatePriv->RestoreAreas)(pBackingPixmap, pExposed, - x, y, pWin); -} - #ifdef RENDER static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn, int op, CARD16 red, @@ -1674,8 +1652,6 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAA_STATE_WRAP(PaintWindowBackground); XAA_STATE_WRAP(PaintWindowBorder); XAA_STATE_WRAP(CopyWindow); - XAA_STATE_WRAP(SaveAreas); - XAA_STATE_WRAP(RestoreAreas); #ifdef RENDER XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2); XAA_STATE_WRAP(SetupForCPUToScreenTexture2); |