diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2006-10-31 16:10:07 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-02-05 19:32:00 +0200 |
| commit | 23b12b9ff55224e8c3c45eb58ea5fbf2f747d82e (patch) | |
| tree | 1cfb22b70ab001da741ab06407ce3bc322f84d9d /src/atiaccel.c | |
| parent | bc3b222b57d7edf7bdce00a53e8abd9047c314a4 (diff) | |
Consolidate atiaccel.c w/ atimach64accel.c, part 2.
Merge ATIInitializeAcceleration() in ATIMach64AccelInit().
Diffstat (limited to 'src/atiaccel.c')
| -rw-r--r-- | src/atiaccel.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/src/atiaccel.c b/src/atiaccel.c deleted file mode 100644 index a1f09aaa..00000000 --- a/src/atiaccel.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * - * 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 and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of Marc Aurele La France not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Marc Aurele La France makes no representations - * about the suitability of this software for any purpose. It is provided - * "as-is" without express or implied warranty. - * - * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO - * EVENT SHALL MARC AURELE LA FRANCE 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, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - * - * DRI support by: - * Leif Delgass <ldelgass@retinalburn.net> - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "atiaccel.h" -#include "atimach64accel.h" -#include "atistruct.h" - -#ifdef USE_XAA -/* - * ATIInitializeAcceleration -- - * - * This function is called to initialise both the framebuffer manager and XAA - * on a screen. - */ -Bool -ATIInitializeAcceleration -( - ScreenPtr pScreen, - ScrnInfoPtr pScreenInfo, - ATIPtr pATI -) -{ - if (pATI->OptionAccel) - { - if (!(pATI->pXAAInfo = XAACreateInfoRec())) - return FALSE; - - { - ATIMach64AccelInit(pATI, pATI->pXAAInfo); - } - } - - if (!pATI->OptionAccel || XAAInit(pScreen, pATI->pXAAInfo)) - return TRUE; - - XAADestroyInfoRec(pATI->pXAAInfo); - pATI->pXAAInfo = NULL; - return FALSE; -} -#endif /* USE_XAA */ |