diff options
| author | Chris Ball <cjb@laptop.org> | 2009-02-24 12:32:01 -0500 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2009-02-24 12:32:01 -0500 |
| commit | 7adc184e5e0f3df00423ea99b325d24764c1c067 (patch) | |
| tree | d3d323f01f8f2e3ae73eb1c5d5673bbe45c5c570 | |
| parent | e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c (diff) | |
Build fixes for EXA3
* EXA in xserver head now requires -DEXA_DRIVER_KNOWN_MAJOR=3
* EXA3 drops the UploadToScratch hook, so guard it for < 3 only.
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/sis300_accel.c | 5 | ||||
| -rw-r--r-- | src/sis310_accel.c | 5 | ||||
| -rw-r--r-- | src/sis_accel.c | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 089c5fa..59df62c 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,7 @@ 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" diff --git a/src/sis300_accel.c b/src/sis300_accel.c index 503dee9..a8fa373 100644 --- a/src/sis300_accel.c +++ b/src/sis300_accel.c @@ -1365,6 +1365,9 @@ 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); @@ -1372,7 +1375,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 */ diff --git a/src/sis310_accel.c b/src/sis310_accel.c index 8bba823..af9b9ad 100644 --- a/src/sis310_accel.c +++ b/src/sis310_accel.c @@ -2399,6 +2399,9 @@ 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); @@ -2406,7 +2409,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 */ diff --git a/src/sis_accel.c b/src/sis_accel.c index b85c893..82aee95 100644 --- a/src/sis_accel.c +++ b/src/sis_accel.c @@ -880,6 +880,9 @@ 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); @@ -887,7 +890,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 */ |