diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-21 12:07:29 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-21 12:07:29 +0100 |
| commit | 361c49ad3cfe58b9ab98dfb6e95de505c0d63730 (patch) | |
| tree | 179130ffb2688ea0468806344aa72040e9afd26a /src | |
| parent | cdcc6f23e8cad797e6cfd57e2ff454ec8509b5ba (diff) | |
Fix bug #7930, i810 doesn't compile without DRI
(Samuel Thibault)
Diffstat (limited to 'src')
| -rw-r--r-- | src/brw_structs.h | 2 | ||||
| -rw-r--r-- | src/i810_driver.c | 6 | ||||
| -rw-r--r-- | src/i830_accel.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/brw_structs.h b/src/brw_structs.h index c9c07510..50b5fda9 100644 --- a/src/brw_structs.h +++ b/src/brw_structs.h @@ -28,6 +28,8 @@ #ifndef BRW_STRUCTS_H #define BRW_STRUCTS_H +#include <GL/gl.h> + /* Command packets: */ struct header diff --git a/src/i810_driver.c b/src/i810_driver.c index 3481d0b7..22635c86 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -333,6 +333,8 @@ const char *I810driSymbols[] = { NULL }; +#endif /* I830_ONLY */ + const char *I810shadowSymbols[] = { "shadowInit", "shadowSetup", @@ -340,8 +342,6 @@ const char *I810shadowSymbols[] = { NULL }; -#endif /* I830_ONLY */ - #ifndef I810_DEBUG int I810_DEBUG = (0 /* | DEBUG_ALWAYS_SYNC */ @@ -408,9 +408,9 @@ i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) #ifdef XF86DRI I810drmSymbols, I810driSymbols, +#endif I810shadowSymbols, I810shadowFBSymbols, -#endif I810vbeSymbols, vbeOptionalSymbols, I810ddcSymbols, I810int10Symbols, NULL); diff --git a/src/i830_accel.c b/src/i830_accel.c index aa43cbec..b029968e 100644 --- a/src/i830_accel.c +++ b/src/i830_accel.c @@ -395,6 +395,7 @@ I830AccelInit(ScreenPtr pScreen) return XAAInit(pScreen, infoPtr); } +#ifdef XF86DRI static unsigned int CheckTiling(ScrnInfoPtr pScrn) { @@ -416,6 +417,9 @@ CheckTiling(ScrnInfoPtr pScrn) return tiled; } +#else +#define CheckTiling(pScrn) 0 +#endif void I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop, |