mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-22 01:20:26 +00:00
Updated xgl code drop from Novell + xserver tree changes
This commit is contained in:
parent
b5356e0afa
commit
e70b64b930
42 changed files with 11179 additions and 2712 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Copyright © 2004 David Reveman
|
||||
*
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software
|
||||
* and its documentation for any purpose is hereby granted without
|
||||
* fee, provided that the above copyright notice appear in all copies
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
* software for any purpose. It is provided "as is" without express or
|
||||
* implied warranty.
|
||||
*
|
||||
* DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
|
||||
* NO EVENT SHALL DAVID REVEMAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
||||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*
|
||||
|
|
@ -69,12 +69,12 @@ xglSaveAreas (PixmapPtr pPixmap,
|
|||
box.y1 += yorg;
|
||||
box.x2 += xorg;
|
||||
box.y2 += yorg;
|
||||
|
||||
|
||||
if (!xglSyncBits (&pWin->drawable, &box))
|
||||
FatalError (XGL_SW_FAILURE_STRING);
|
||||
|
||||
|
||||
XGL_BSTORE_FALLBACK_PROLOGUE (&pPixmap->drawable,
|
||||
BackingStoreFuncs.RestoreAreas);
|
||||
BackingStoreFuncs.SaveAreas);
|
||||
(*pScreen->BackingStoreFuncs.SaveAreas) (pPixmap, prgnSave,
|
||||
xorg, yorg, pWin);
|
||||
XGL_BSTORE_FALLBACK_EPILOGUE (&pPixmap->drawable,
|
||||
|
|
@ -111,10 +111,10 @@ xglRestoreAreas (PixmapPtr pPixmap,
|
|||
box.y1 = pExt->y1 - yorg;
|
||||
box.x2 = pExt->x2 - xorg;
|
||||
box.y2 = pExt->y2 - yorg;
|
||||
|
||||
|
||||
if (!xglSyncBits (&pPixmap->drawable, &box))
|
||||
FatalError (XGL_SW_FAILURE_STRING);
|
||||
|
||||
|
||||
XGL_BSTORE_FALLBACK_PROLOGUE (&pWin->drawable,
|
||||
BackingStoreFuncs.RestoreAreas);
|
||||
(*pScreen->BackingStoreFuncs.RestoreAreas) (pPixmap, prgnRestore,
|
||||
|
|
|
|||
Loading…
Reference in a new issue