XLibre/xf86-video-sis
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-sis.git synced 2026-03-24 01:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Build fixes for EXA3"

Browse Source 
This reverts commit 7adc184e5e.
The EXA developers have backed out this ABI bump.

Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Chris Ball
2009-02-27 10:57:35 -05:00
parent 7adc184e5e
commit 5583c2342d
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -99,7 +99,6 @@ fi
# technically this should be a configure flag. meh.
AC_DEFINE(XF86EXA, 1, [Build support for Exa])
AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"

5
src/sis300_accel.c
View File

@@ -1365,9 +1365,6 @@ SiS300AccelInit(ScreenPtr pScreen)
return FALSE;
}
#if EXA_VERSION_MAJOR < 3
/* UploadToScratch has been dropped in EXA version 3. */
/* Reserve locked offscreen scratch area of 128K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE,
SiSScratchSave, pSiS);
@@ -1375,7 +1372,7 @@ SiS300AccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
#endif
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */

5
src/sis310_accel.c
View File

@@ -2399,9 +2399,6 @@ SiS315AccelInit(ScreenPtr pScreen)
return FALSE;
}
#if EXA_VERSION_MAJOR < 3
/* UploadToScratch has been dropped in EXA version 3. */
/* Reserve locked offscreen scratch area of 128K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE,
SiSScratchSave, pSiS);
@@ -2409,7 +2406,7 @@ SiS315AccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
#endif
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */

5
src/sis_accel.c
View File

@@ -880,9 +880,6 @@ SiSAccelInit(ScreenPtr pScreen)
return FALSE;
}
#if EXA_VERSION_MAJOR < 3
/* UploadToScratch has been dropped in EXA version 3. */
/* Reserve locked offscreen scratch area of 64K for glyph data */
pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 64 * 1024, 16, TRUE,
SiSScratchSave, pSiS);
@@ -890,7 +887,7 @@ SiSAccelInit(ScreenPtr pScreen)
pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
}
#endif
} else {
pSiS->NoXvideo = TRUE; /* No fbmem manager -> no xv */